Fixing themed icons not getting cropped to icon mask am: bd0c04a42d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/17007587

Change-Id: I3201302c2e8a11b6b7cf6d39d410dd5a847edabe

1 files changed, 20 insertions, 1 deletions

diff --git a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
index 9dbfa86..c0be55d 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
@@ -204,7 +204,7 @@ public class BaseIconFactory implements AutoCloseable {
             Drawable mono = ((AdaptiveIconDrawable) icon).getMonochrome();
             if (mono != null) {
                 // Convert mono drawable to bitmap
-                Drawable paddedMono = new InsetDrawable(mono, -getExtraInsetFraction());
+                Drawable paddedMono = new ClippedMonoDrawable(mono);
                 info.setMonoIcon(
                         createIconBitmap(paddedMono, scale[0], mIconBitmapSize, Config.ALPHA_8),
                         this);
@@ -472,4 +472,23 @@ public class BaseIconFactory implements AutoCloseable {
             return 1;
         }
     }
+
+    private static class ClippedMonoDrawable extends InsetDrawable {
+
+        private final AdaptiveIconDrawable mCrop;
+
+        public ClippedMonoDrawable(Drawable base) {
+            super(base, -getExtraInsetFraction());
+            mCrop = new AdaptiveIconDrawable(new ColorDrawable(Color.BLACK), null);
+        }
+
+        @Override
+        public void draw(Canvas canvas) {
+            mCrop.setBounds(getBounds());
+            int saveCount = canvas.save();
+            canvas.clipPath(mCrop.getIconMask());
+            super.draw(canvas);
+            canvas.restoreToCount(saveCount);
+        }
+    }
 }