diff --git a/lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideRepository.kt b/lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideRepository.kt index 5cb8683057..dc7d492baf 100644 --- a/lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideRepository.kt +++ b/lawnchair/src/app/lawnchair/data/iconoverride/IconOverrideRepository.kt @@ -1,6 +1,7 @@ package app.lawnchair.data.iconoverride import android.content.Context +import android.os.UserHandle import app.lawnchair.data.AppDatabase import app.lawnchair.icons.picker.IconPickerItem import com.android.launcher3.LauncherAppState @@ -52,11 +53,15 @@ class IconOverrideRepository @Inject constructor( suspend fun setOverride(target: ComponentKey, item: IconPickerItem) { dao.insert(IconOverride(target, item)) + // Keep the in-memory map in sync before any icon reload. The Room Flow update is + // async and can race with onAppIconChanged / forceReload, leaving stale icons cached. + _overridesMap = _overridesMap + (target to item) updatePackageQueue.offer(target) } suspend fun deleteOverride(target: ComponentKey) { dao.delete(target) + _overridesMap = _overridesMap - target updatePackageQueue.offer(target) } @@ -64,8 +69,24 @@ class IconOverrideRepository @Inject constructor( fun observeCount() = dao.observeCount() + /** + * Returns a persistable fingerprint of per-app icon overrides for [packageName]/[user]. + * Used as part of icon-cache freshness so clearing an override invalidates the cache entry. + */ + fun getPackageOverrideState(packageName: String, user: UserHandle): String { + return overridesMap.asSequence() + .filter { + it.key.componentName.packageName == packageName && it.key.user == user + } + .sortedBy { it.key.componentName.className } + .joinToString(";") { (key, item) -> + "${key.componentName.className}:${item.packPackageName}/${item.drawableName}/${item.type}" + } + } + suspend fun deleteAll() { dao.deleteAll() + _overridesMap = emptyMap() LauncherAppState.getInstance(context).model.reloadIfActive() } diff --git a/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt b/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt index b250d84c4a..67c235ce10 100644 --- a/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt +++ b/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt @@ -215,13 +215,20 @@ class LawnchairIconProvider @Inject constructor( override fun getStateForApp(info: ApplicationInfo?): String { val base = super.getStateForApp(info) + val overrideState = if (info != null) { + val user = UserHandle.getUserHandleForUid(info.uid) + overrideRepo.getPackageOverrideState(info.packageName, user) + } else { + "" + } return "$base|lc:" + "ip=${iconPackPref.get()}," + "tip=${themedIconSourcePref.get()}," + "ti=${prefs.themedIcons.get()}," + "dti=${prefs.drawerThemedIcons.get()}," + "fm=${prefs.forceIconMonochrome.get()}," + - "tb=${prefs.tintIconPackBackgrounds.get()}" + "tb=${prefs.tintIconPackBackgrounds.get()}," + + "ov=$overrideState" } override fun getThemeDataForPackage(packageName: String?): ThemeData? { diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectIconPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectIconPreference.kt index c9a370841a..28746a82e3 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectIconPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectIconPreference.kt @@ -26,7 +26,9 @@ import app.lawnchair.util.requireSystemService import com.android.launcher3.LauncherAppState import com.android.launcher3.R import com.android.launcher3.util.ComponentKey +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext private const val TAG = "SelectIconPreference" @@ -46,11 +48,15 @@ fun SelectIconPreference(componentKey: ComponentKey) { OnResult { item -> scope.launch { repo.setOverride(componentKey, item) + // Refresh package icons while the model is still loaded; forceReload alone can + // skip PackageUpdatedTask and leave icon-cache entries that look "fresh". + // onAppIconChanged is @WorkerThread (blocking ShortcutManager query). + withContext(Dispatchers.IO) { + model.onAppIconChanged(componentKey.componentName.packageName, componentKey.user) + } (context as Activity).let { it.setResult(Activity.RESULT_OK) it.finish() - model.onAppIconChanged(componentKey.componentName.packageName, componentKey.user) - model.forceReload() } } } @@ -66,11 +72,15 @@ fun SelectIconPreference(componentKey: ComponentKey) { onClick = { scope.launch { repo.deleteOverride(componentKey) + withContext(Dispatchers.IO) { + model.onAppIconChanged( + componentKey.componentName.packageName, + componentKey.user, + ) + } (context as Activity).let { it.setResult(Activity.RESULT_OK) it.finish() - model.onAppIconChanged(componentKey.componentName.packageName, componentKey.user) - model.forceReload() } } },