Merge "Separate color into app color and dot color" into tm-dev

1 files changed, 5 insertions, 2 deletions

diff --git a/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java b/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
index 361a7d9..a42232e 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
@@ -125,7 +125,7 @@ public class DotRenderer {
 
         mCirclePaint.setColor(Color.BLACK);
         canvas.drawBitmap(mBackgroundWithShadow, mBitmapOffset, mBitmapOffset, mCirclePaint);
-        mCirclePaint.setColor(params.color);
+        mCirclePaint.setColor(params.dotColor);
         canvas.drawCircle(0, 0, mCircleRadius, mCirclePaint);
         canvas.restore();
     }
@@ -133,7 +133,10 @@ public class DotRenderer {
     public static class DrawParams {
         /** The color (possibly based on the icon) to use for the dot. */
         @ViewDebug.ExportedProperty(category = "notification dot", formatToHexString = true)
-        public int color;
+        public int dotColor;
+        /** The color (possibly based on the icon) to use for a predicted app. */
+        @ViewDebug.ExportedProperty(category = "notification dot", formatToHexString = true)
+        public int appColor;
         /** The bounds of the icon that the dot is drawn on top of. */
         @ViewDebug.ExportedProperty(category = "notification dot")
         public Rect iconBounds = new Rect();