Launcher3: Use overridden IconProvider instance consistently

Author: nullxception

quickstep/src/com/android/quickstep/RecentsModel.java

@@ -79,7 +79,7 @@ private RecentsModel(Context context) {
                 context.getSystemService(KeyguardManager.class),
                 SystemUiProxy.INSTANCE.get(context));
 
-        IconProvider iconProvider = new IconProvider(context);
+        IconProvider iconProvider = IconProvider.INSTANCE.get(context);
         mIconCache = new TaskIconCache(context, RECENTS_MODEL_EXECUTOR, iconProvider);
         mIconCache.registerTaskVisualsChangeListener(this);
         mThumbnailCache = new TaskThumbnailCache(context, RECENTS_MODEL_EXECUTOR);

src/com/android/launcher3/LauncherAppState.java

@@ -63,7 +63,7 @@ public class LauncherAppState implements SafeCloseable {
 
     private final Context mContext;
     private final LauncherModel mModel;
-    private final LauncherIconProvider mIconProvider;
+    private final IconProvider mIconProvider;
     private final IconCache mIconCache;
     private final InvariantDeviceProfile mInvariantDeviceProfile;
     private final RunnableList mOnTerminateCallback = new RunnableList();
@@ -167,7 +167,7 @@ public LauncherAppState(Context context, @Nullable String iconCacheFileName) {
         mContext = context;
 
         mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context);
-        mIconProvider = new LauncherIconProvider(context);
+        mIconProvider = IconProvider.INSTANCE.get(context);
         mIconCache = new IconCache(mContext, mInvariantDeviceProfile,
                 iconCacheFileName, mIconProvider);
         mModel = new LauncherModel(context, this, mIconCache, new AppFilter(mContext),
@@ -248,7 +248,10 @@ void verifyIconChanged() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
             if (Themes.KEY_THEMED_ICONS.equals(key)) {
-                mIconProvider.setIconThemeSupported(Themes.isThemedIconEnabled(mContext));
+                if (mIconProvider instanceof LauncherIconProvider) {
+                    ((LauncherIconProvider) mIconProvider)
+                        .setIconThemeSupported(Themes.isThemedIconEnabled(mContext));
+                }
                 verifyIconChanged();
             }
         }

src/com/android/launcher3/Utilities.java

@@ -75,7 +75,6 @@
 import com.android.launcher3.LauncherModel;
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
 import com.android.launcher3.graphics.TintedDrawableSpan;
-import com.android.launcher3.icons.IconProvider;
 import com.android.launcher3.icons.ShortcutCachingLogic;
 import com.android.launcher3.icons.ThemedIconDrawable;
 import com.android.launcher3.LauncherPrefs;
@@ -581,7 +580,8 @@ private static Drawable loadFullDrawableWithoutTheme(Context context, ItemInfo i
             LauncherActivityInfo activityInfo = context.getSystemService(LauncherApps.class)
                     .resolveActivity(info.getIntent(), info.user);
             outObj[0] = activityInfo;
-            return activityInfo == null ? null : IconProvider.INSTANCE.get(context).getIcon(
+            return activityInfo == null ? null : LauncherAppState.getInstance(context)
+                    .getIconProvider().getIcon(
                             activityInfo, activity.getDeviceProfile().inv.fillResIconDpi);
         } else if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
             if (info instanceof PendingAddShortcutInfo) {

src/com/android/launcher3/icons/IconCache.java

@@ -101,7 +101,7 @@ public class IconCache extends BaseIconCache {
     private int mPendingIconRequestCount = 0;
 
     public IconCache(Context context, InvariantDeviceProfile idp) {
-        this(context, idp, LauncherFiles.APP_ICONS_DB, new IconProvider(context));
+        this(context, idp, LauncherFiles.APP_ICONS_DB, IconProvider.INSTANCE.get(context));
     }
 
     public IconCache(Context context, InvariantDeviceProfile idp, String dbFileName,
@@ -114,7 +114,7 @@ public IconCache(Context context, InvariantDeviceProfile idp, String dbFileName,
         mLauncherApps = mContext.getSystemService(LauncherApps.class);
         mUserManager = UserCache.INSTANCE.get(mContext);
         mInstantAppResolver = InstantAppResolver.newInstance(mContext);
-        mIconProvider = IconProvider.INSTANCE.get(mContext);
+        mIconProvider = iconProvider;
         mWidgetCategoryBitmapInfos = new SparseArray<>();
     }
 

src/com/android/launcher3/icons/LauncherActivityCachingLogic.java

@@ -64,8 +64,8 @@ public CharSequence getLabel(@NonNull LauncherActivityInfo object) {
     @Override
     public BitmapInfo loadIcon(@NonNull Context context, @NonNull LauncherActivityInfo object) {
         try (LauncherIcons li = LauncherIcons.obtain(context)) {
-            return li.createBadgedIconBitmap(IconProvider.INSTANCE.get(context)
-                            .getIcon(object, li.mFillResIconDpi),
+            return li.createBadgedIconBitmap(LauncherAppState.getInstance(context)
+                            .getIconProvider().getIcon(object, li.mFillResIconDpi),
                     new IconOptions().setUser(object.getUser()));
         }
     }

src/com/android/launcher3/icons/pack/IconPackHeaderPreference.java

@@ -31,7 +31,7 @@
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.launcher3.R;
-import com.android.launcher3.icons.ThirdPartyIconProvider;
+import com.android.launcher3.icons.IconProvider;
 
 
 public class IconPackHeaderPreference extends RadioHeaderPreference {
@@ -88,7 +88,7 @@ public void onRadioElementSelected(String key) {
             return;
         }
 
-        final ThirdPartyIconProvider iconProvider = new ThirdPartyIconProvider(context);
+        final IconProvider iconProvider = IconProvider.INSTANCE.get(context);
         final PackageManager pm = context.getPackageManager();
         final LauncherApps launcherApps = context.getSystemService(LauncherApps.class);
         new GetLaunchableInfoTask(pm, launcherApps, PREVIEW_ICON_NUM, (aiList) -> {