From 97209503ffbfa6c2d80386fc2bc2dd031d09a03b Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Wed, 13 Oct 2021 12:04:04 +0700
Subject: [PATCH] Use custom adaptive icon class

---
 build.gradle                                      |  2 +-
 .../app/lawnchair/icons/LawnchairIconProvider.kt  | 15 +++++++++++++++
 platform_frameworks_libs_systemui                 |  2 +-
 src/com/android/launcher3/Utilities.java          |  1 +
 src/com/android/launcher3/dragndrop/DragView.java |  4 +++-
 .../launcher3/dragndrop/FolderAdaptiveIcon.java   |  4 +++-
 src/com/android/launcher3/graphics/IconShape.java |  4 +++-
 .../graphics/LauncherPreviewRenderer.java         |  3 ++-
 .../launcher3/icons/ShortcutCachingLogic.java     |  5 ++++-
 9 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index e5c4e53aed..bc06a27a4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 25
+        minSdkVersion 26
         targetSdkVersion 30
         versionCode 7
         def versionDisplayName = "12.0 Alpha 6.1"
diff --git a/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt b/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt
index dffe5a4d87..3c728c610b 100644
--- a/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt
+++ b/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt
@@ -2,6 +2,9 @@ package app.lawnchair.icons
 
 import android.content.*
 import android.content.Intent.*
+import android.content.pm.ActivityInfo
+import android.content.pm.LauncherActivityInfo
+import android.graphics.drawable.AdaptiveIconDrawable
 import android.graphics.drawable.Drawable
 import android.os.Handler
 import android.os.Process
@@ -46,6 +49,18 @@ class LawnchairIconProvider @JvmOverloads constructor(
         return icon ?: super.getIconWithOverrides(packageName, component, user, iconDpi, fallback)
     }
 
+    override fun getIcon(info: ActivityInfo?): Drawable {
+        return CustomAdaptiveIconDrawable.wrapNonNull(super.getIcon(info))
+    }
+
+    override fun getIcon(info: ActivityInfo?, iconDpi: Int): Drawable {
+        return CustomAdaptiveIconDrawable.wrapNonNull(super.getIcon(info, iconDpi))
+    }
+
+    override fun getIcon(info: LauncherActivityInfo?, iconDpi: Int): Drawable {
+        return CustomAdaptiveIconDrawable.wrapNonNull(super.getIcon(info, iconDpi))
+    }
+
     override fun getSystemStateForPackage(systemState: String, packageName: String): String {
         return super.getSystemStateForPackage(systemState, packageName)
     }
diff --git a/platform_frameworks_libs_systemui b/platform_frameworks_libs_systemui
index 355f582efd..c7456f2f15 160000
--- a/platform_frameworks_libs_systemui
+++ b/platform_frameworks_libs_systemui
@@ -1 +1 @@
-Subproject commit 355f582efdf4b124a889d08cc37346545b049eff
+Subproject commit c7456f2f15685b3ffe347acecbff70a923682b93
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 36f59b79ec..d99cfb4a6f 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -96,6 +96,7 @@ import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import app.lawnchair.icons.CustomAdaptiveIconDrawable;
 import app.lawnchair.preferences.PreferenceManager;
 
 /**
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 5b97e67155..f9ba4b4fde 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -68,6 +68,8 @@ import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.BaseDragLayer;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
 
+import app.lawnchair.icons.CustomAdaptiveIconDrawable;
+
 /** A custom view for rendering an icon, folder, shortcut or widget during drag-n-drop. */
 public class DragView extends FrameLayout implements StateListener<LauncherState> {
 
@@ -245,7 +247,7 @@ public class DragView extends FrameLayout implements StateListener<LauncherState
                         nDr = dr;
                     } else {
                         // Since we just want the scale, avoid heavy drawing operations
-                        nDr = new AdaptiveIconDrawable(new ColorDrawable(Color.BLACK), null);
+                        nDr = new CustomAdaptiveIconDrawable(new ColorDrawable(Color.BLACK), null);
                     }
                     Utilities.scaleRectAboutCenter(bounds,
                             li.getNormalizer().getScale(nDr, null, null, null));
diff --git a/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java b/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
index 98c0cfc3a6..b4cbf3a1d7 100644
--- a/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
+++ b/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
@@ -39,11 +39,13 @@ import com.android.launcher3.graphics.ShiftedBitmapDrawable;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.util.Preconditions;
 
+import app.lawnchair.icons.CustomAdaptiveIconDrawable;
+
 /**
  * {@link AdaptiveIconDrawable} representation of a {@link FolderIcon}
  */
 @TargetApi(Build.VERSION_CODES.O)
-public class FolderAdaptiveIcon extends AdaptiveIconDrawable {
+public class FolderAdaptiveIcon extends CustomAdaptiveIconDrawable {
     private static final String TAG = "FolderAdaptiveIcon";
 
     private final Drawable mBadge;
diff --git a/src/com/android/launcher3/graphics/IconShape.java b/src/com/android/launcher3/graphics/IconShape.java
index f82b07ebfa..2ec30cc303 100644
--- a/src/com/android/launcher3/graphics/IconShape.java
+++ b/src/com/android/launcher3/graphics/IconShape.java
@@ -54,6 +54,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import app.lawnchair.icons.CustomAdaptiveIconDrawable;
+
 /**
  * Abstract representation of the shape of an icon shape
  */
@@ -435,7 +437,7 @@ public abstract class IconShape {
 
         Region full = new Region(0, 0, size, size);
         Region iconR = new Region();
-        AdaptiveIconDrawable drawable = new AdaptiveIconDrawable(
+        AdaptiveIconDrawable drawable = new CustomAdaptiveIconDrawable(
                 new ColorDrawable(Color.BLACK), new ColorDrawable(Color.BLACK));
         drawable.setBounds(0, 0, size, size);
         iconR.setPath(drawable.getIconMask(), full);
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 7a68fa43ec..98136feefb 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -105,6 +105,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 
 import app.lawnchair.font.FontCache;
 import app.lawnchair.font.FontManager;
+import app.lawnchair.icons.CustomAdaptiveIconDrawable;
 import app.lawnchair.icons.IconPackProvider;
 import app.lawnchair.preferences.PreferenceManager;
 
@@ -250,7 +251,7 @@ public class LauncherPreviewRenderer extends ContextWrapper
 
         BaseIconFactory iconFactory =
                 new BaseIconFactory(context, mIdp.fillResIconDpi, mIdp.iconBitmapSize) { };
-        BitmapInfo iconInfo = iconFactory.createBadgedIconBitmap(new AdaptiveIconDrawable(
+        BitmapInfo iconInfo = iconFactory.createBadgedIconBitmap(new CustomAdaptiveIconDrawable(
                         new ColorDrawable(Color.WHITE), new ColorDrawable(Color.WHITE)),
                 Process.myUserHandle(),
                 Build.VERSION.SDK_INT);
diff --git a/src/com/android/launcher3/icons/ShortcutCachingLogic.java b/src/com/android/launcher3/icons/ShortcutCachingLogic.java
index d7eed06901..49d12448d9 100644
--- a/src/com/android/launcher3/icons/ShortcutCachingLogic.java
+++ b/src/com/android/launcher3/icons/ShortcutCachingLogic.java
@@ -36,6 +36,8 @@ import com.android.launcher3.icons.cache.CachingLogic;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.Themes;
 
+import app.lawnchair.icons.CustomAdaptiveIconDrawable;
+
 /**
  * Caching logic for shortcuts.
  */
@@ -98,8 +100,9 @@ public class ShortcutCachingLogic implements CachingLogic<ShortcutInfo> {
             return null;
         }
         try {
-            return context.getSystemService(LauncherApps.class)
+            Drawable icon = context.getSystemService(LauncherApps.class)
                     .getShortcutIconDrawable(shortcutInfo, density);
+            return CustomAdaptiveIconDrawable.wrap(icon);
         } catch (SecurityException | IllegalStateException e) {
             Log.e(TAG, "Failed to get shortcut icon", e);
             return null;