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); } }