commit f60effaad6d55786f87d6138be34b3909b1b5726
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 18 18:42:11 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 18 18:42:11 2023 +0000
tree 755d03902f9d861dda79f5653c9c99ec032c5b6f
parent b521b0e6681766023df9d19fa04706759844eb2d
parent 278a3578b955216d90f08c19f11e801b086e0159

Merge "Updated API use of ColorScheme and TonalPalette" into tm-qpr-dev

src/com/android/customization/model/color/ColorProvider.kt

diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt
index 3d2cc7e..201a53f 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -221,10 +221,10 @@
     @ColorInt
     private fun ColorScheme.getLightColorPreview(): IntArray {
         return intArrayOf(
-            setAlphaComponent(this.accent1[2], ALPHA_MASK),
-            setAlphaComponent(this.accent1[2], ALPHA_MASK),
-            ColorStateList.valueOf(this.accent3[6]).withLStar(85f).colors[0],
-            setAlphaComponent(this.accent1[6], ALPHA_MASK)
+            setAlphaComponent(this.accent1.s100, ALPHA_MASK),
+            setAlphaComponent(this.accent1.s100, ALPHA_MASK),
+            ColorStateList.valueOf(this.accent3.s500).withLStar(85f).colors[0],
+            setAlphaComponent(this.accent1.s500, ALPHA_MASK)
         )
     }
 
@@ -235,23 +235,23 @@
     @ColorInt
     private fun ColorScheme.getDarkColorPreview(): IntArray {
         return intArrayOf(
-            setAlphaComponent(this.accent1[2], ALPHA_MASK),
-            setAlphaComponent(this.accent1[2], ALPHA_MASK),
-            ColorStateList.valueOf(this.accent3[6]).withLStar(85f).colors[0],
-            setAlphaComponent(this.accent1[6], ALPHA_MASK)
+            setAlphaComponent(this.accent1.s100, ALPHA_MASK),
+            setAlphaComponent(this.accent1.s100, ALPHA_MASK),
+            ColorStateList.valueOf(this.accent3.s500).withLStar(85f).colors[0],
+            setAlphaComponent(this.accent1.s500, ALPHA_MASK)
         )
     }
 
     private fun ColorScheme.getPresetColorPreview(seed: Int): IntArray {
         return when (this.style) {
-            Style.FRUIT_SALAD -> intArrayOf(seed, this.accent1[2])
+            Style.FRUIT_SALAD -> intArrayOf(seed, this.accent1.s100)
             Style.TONAL_SPOT -> intArrayOf(this.accentColor, this.accentColor)
             Style.MONOCHROMATIC ->
                 intArrayOf(
                     setAlphaComponent(0x000000, 255),
                     setAlphaComponent(0xFFFFFF, 255),
                 )
-            else -> intArrayOf(this.accent1[2], this.accent1[2])
+            else -> intArrayOf(this.accent1.s100, this.accent1.s100)
         }
     }
 

src/com/android/customization/model/color/WallpaperColorResources.java

diff --git a/src/com/android/customization/model/color/WallpaperColorResources.java b/src/com/android/customization/model/color/WallpaperColorResources.java
index eb8b39b..dc3b903 100644
--- a/src/com/android/customization/model/color/WallpaperColorResources.java
+++ b/src/com/android/customization/model/color/WallpaperColorResources.java
@@ -21,8 +21,7 @@
 import android.widget.RemoteViews.ColorResources;
 
 import com.android.systemui.monet.ColorScheme;
-
-import java.util.List;
+import com.android.systemui.monet.TonalPalette;
 
 /** A class to override colors in a {@link Context} with wallpaper colors. */
 public class WallpaperColorResources {
@@ -43,9 +42,9 @@
         ColorResources.create(context, mColorOverlay).apply(context);
     }
 
-    private void addOverlayColor(List<Integer> colors, int firstResourceColorId) {
+    private void addOverlayColor(TonalPalette colorSchemehue, int firstResourceColorId) {
         int resourceColorId = firstResourceColorId;
-        for (int color : colors) {
+        for (int color : colorSchemehue.getAllShades()) {
             mColorOverlay.put(resourceColorId, color);
             resourceColorId++;
         }