summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames O'Leary <jamesoleary@google.com>2022-05-05 16:51:22 +0000
committerJames O'Leary <jamesoleary@google.com>2022-05-09 14:25:15 +0000
commit390d55bc1c7b7cde2ef28101cf911b820c672aaa (patch)
treeb8ccf890fd36f14fd2438fa12466f483f560ba6d
parent8a3cadabdfc8dfdf35883194efb5028427782724 (diff)
downloadsystemui-390d55bc1c7b7cde2ef28101cf911b820c672aaa.tar.gz
Separate color into app color and dot color
Design intends for predicted app disc to use the app color, and the dot to use tertiary T90/shade100. Both currently use `color`. Separating into two separate colors lets use define the two separate colors requested by design. Bug: 213314628 Test: Manual inspection at runtime Change-Id: I2e1656e9d806427a2fa8d4e79e414f99d9308086
-rw-r--r--iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java7
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();