From 64bc9c232b15537ff32b94d86d808153515a3770 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 13 Nov 2022 13:06:59 +0530 Subject: [PATCH] Fix : Themed icons turn off automatically when dark mode changes (#3099) * Experimental feature - Transparent Background * Refactor method name * Transparent bg fix for clock * Sync submodule * resync * Update lawnchair/res/values/strings.xml Co-authored-by: Yasan * Update platform_frameworks_libs_systemui * Enable Smart hide * Update lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt Co-authored-by: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> * enableSmartHide only when showHiddenAppsInSearch is disabled Co-authored-by: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> * updated new Layout * Remove smart hide description * Rename pref titiles * Cleanup equals * Remerge submodule * Revert "AGP 7.3.1 & KSP 1.0.7" This reverts commit bb024ef89e41a62197f2c53f782b8d96eb59ec24. * clock * Revert "clock" This reverts commit 44b4f6d9db4301d86540e37a66681b64a1e2bea3. * Update platform_frameworks_libs_systemui * Update lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt Co-authored-by: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> * Rename Title * Revert changes in build.gradle * resync platform module * Hide hideHiddenAppsInSearch when showDrawerSearchBar is disabled * fix overlap issue * Hide conf options of Hidden Apps if no hidden apps * ThemedIcons * Implementation for wrapping Lawnicons from iconspack * resync platform ui * Cleanup * Cleanup * Update config.xml * resync module * Enable Themed option if any supported package is installed * Use `any` * Use `apply` * Fix auto turn of themed icons when lawnicons is not installed * resync Fix package name for Lawnicons * Tweak Co-authored-by: Goooler Co-authored-by: Yasan Co-authored-by: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> --- lawnchair/src/app/lawnchair/LawnchairLauncher.kt | 3 +-- src/com/android/launcher3/model/PackageUpdatedTask.java | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt index 011c2b05cf..c8f1889fc0 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt @@ -51,7 +51,6 @@ import app.lawnchair.root.RootNotAvailableException import app.lawnchair.search.LawnchairSearchAdapterProvider import app.lawnchair.theme.ThemeProvider import app.lawnchair.ui.popup.LawnchairShortcut -import app.lawnchair.util.Constants.LAWNICONS_PACKAGE_NAME import app.lawnchair.util.isPackageInstalled import com.android.launcher3.* import com.android.launcher3.R @@ -227,7 +226,7 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner, // Handle update from version 12 Alpha 4 to version 12 Alpha 5. if ( prefs.themedIcons.get() && - !packageManager.isPackageInstalled(packageName = LAWNICONS_PACKAGE_NAME) + !resources.getStringArray(R.array.themed_icon_packs).any { packageManager.isPackageInstalled(it) } ) { prefs.themedIcons.set(newValue = false) } diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java index cfb30db781..0f0ac715ec 100644 --- a/src/com/android/launcher3/model/PackageUpdatedTask.java +++ b/src/com/android/launcher3/model/PackageUpdatedTask.java @@ -21,7 +21,6 @@ import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ import static com.android.launcher3.model.data.WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON; import static com.android.launcher3.model.data.WorkspaceItemInfo.FLAG_RESTORED_ICON; -import static app.lawnchair.util.Constants.LAWNICONS_PACKAGE_NAME; import android.content.ComponentName; import android.content.Context; @@ -32,6 +31,7 @@ import android.content.pm.ShortcutInfo; import android.os.UserHandle; import android.os.UserManager; import android.util.Log; +import android.content.pm.PackageManager; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; @@ -54,6 +54,7 @@ import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.SafeCloseable; +import com.android.launcher3.icons.R; import java.util.ArrayList; import java.util.Arrays; @@ -106,6 +107,7 @@ public class PackageUpdatedTask extends BaseModelUpdateTask { : ItemInfoMatcher.ofPackages(packageSet, mUser); final HashSet removedComponents = new HashSet<>(); final HashMap> activitiesLists = new HashMap<>(); + final PackageManagerHelper packageManagerHelper = new PackageManagerHelper(context); switch (mOp) { case OP_ADD: { @@ -150,7 +152,8 @@ public class PackageUpdatedTask extends BaseModelUpdateTask { if (packages[i].equals(pm.getIconPackPackage().get())) { pm.getIconPackPackage().set(""); }; - if (packages[i].equals(LAWNICONS_PACKAGE_NAME)) { + if (Arrays.stream(context.getResources().getStringArray(R.array.themed_icon_packs)) + .noneMatch(it -> packageManagerHelper.isAppInstalled(it, mUser))) { pm.getThemedIcons().set(false); } }