commit 2a7b2216763ced14a6c5b0bf83bc1753cf1a2c0f
author Charlie Anderson <charlander@google.com> Mon Aug 19 18:28:41 2024 -0400
committer Charlie Anderson <charlander@google.com> Thu Aug 22 18:59:14 2024 +0000
tree 78fb950b0c82e4ce4d36e4d513537db4fc6bfc28
parent 3a4775961980706d07ec8589baa71823114a89ce

Fix cropped pre-archived app icons by converting to a fixed Adaptive Icon

Bug: 358123888
Test: locally testing B&R with pre-archiving
Flag: com.android.launcher3.use_new_icon_for_archived_apps
Change-Id: Id01ef1e1812dda14a8b456834506c28aebc34623

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

diff --git a/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java b/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
index 406f697..de2269c 100644
--- a/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
+++ b/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java
@@ -18,10 +18,12 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.LauncherActivityInfo;
+import android.os.Build;
 import android.os.UserHandle;
 
 import androidx.annotation.NonNull;
 
+import com.android.launcher3.Flags;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.icons.BaseIconFactory.IconOptions;
@@ -64,9 +66,16 @@
     @Override
     public BitmapInfo loadIcon(@NonNull Context context, @NonNull LauncherActivityInfo object) {
         try (LauncherIcons li = LauncherIcons.obtain(context)) {
-            return li.createBadgedIconBitmap(LauncherAppState.getInstance(context)
-                            .getIconProvider().getIcon(object, li.mFillResIconDpi),
-                    new IconOptions().setUser(object.getUser()));
+            IconOptions iconOptions = new IconOptions().setUser(object.getUser());
+            iconOptions.mIsArchived = Flags.useNewIconForArchivedApps()
+                && Build.VERSION.SDK_INT >= 35
+                && object.getActivityInfo().isArchived;
+            return li.createBadgedIconBitmap(
+                    LauncherAppState.getInstance(context)
+                        .getIconProvider()
+                        .getIcon(object, li.mFillResIconDpi),
+                    iconOptions
+            );
         }
     }
 }