Using theme color as primary icon color

Bug: 188839628
Test: Manual
Change-Id: Ieb64337512ab7664b80e2a452b59799cccc45800

3 files changed, 11 insertions, 4 deletions

diff --git a/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java b/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java
index ad9267a..41de147 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java
@@ -297,9 +297,9 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap
             if (themeData != null) {
                 ClockDrawableWrapper wrapper = fromThemeData(context, themeData);
                 if (wrapper != null) {
-                    ColorFilter bgFilter = new PorterDuffColorFilter(
-                            getColors(context)[0], Mode.SRC_ATOP);
-                    ClockBitmapInfo bitmapInfo = new ClockBitmapInfo(icon, color, scale,
+                    int[] colors = getColors(context);
+                    ColorFilter bgFilter = new PorterDuffColorFilter(colors[0], Mode.SRC_ATOP);
+                    ClockBitmapInfo bitmapInfo = new ClockBitmapInfo(icon, colors[1], scale,
                             wrapper.mAnimationInfo, mFlattenedBackground, themeData) {
 
                         @Override
diff --git a/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java b/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java
index cf510a1..72864c8 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/FastBitmapDrawable.java
@@ -113,6 +113,13 @@ public class FastBitmapDrawable extends Drawable {
         canvas.drawBitmap(mBitmap, null, bounds, mPaint);
     }
 
+    /**
+     * Returns the primary icon color
+     */
+    public int getIconColor() {
+        return mIconColor;
+    }
+
     @Override
     public void setColorFilter(ColorFilter cf) {
         mColorFilter = cf;
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java b/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
index da62712..b4d72d4 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
@@ -67,7 +67,7 @@ public class ThemedIconDrawable extends FastBitmapDrawable {
     private final Rect mBadgeBounds;
 
     protected ThemedIconDrawable(ThemedConstantState constantState) {
-        super(constantState.mBitmap, constantState.mIconColor, constantState.mIsDisabled);
+        super(constantState.mBitmap, constantState.colorFg, constantState.mIsDisabled);
         bitmapInfo = constantState.bitmapInfo;
         colorBg = constantState.colorBg;
         colorFg = constantState.colorFg;