commit d3c279d30f2112e2ffda306dc5305b3159bb3000
author Catherine Liang <cathliang@google.com> Tue Jan 31 15:38:18 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 15:38:18 2023 +0000
tree 8cbc36348317a0b62c7d711ccf86102718c86c10
parent a81df0d3e74d12e6e02b30a8ae41993fb8134cba
parent 22e75ad964d720966a039fcc5838c69f7abd3087

Merge "Color Option Mapping Correction" 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 201a53f..fbe840e 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -220,12 +220,22 @@
      */
     @ColorInt
     private fun ColorScheme.getLightColorPreview(): IntArray {
-        return intArrayOf(
-            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)
-        )
+        return when (this.style) {
+            Style.EXPRESSIVE ->
+                intArrayOf(
+                    setAlphaComponent(this.accent1.s100, ALPHA_MASK),
+                    setAlphaComponent(this.accent1.s100, ALPHA_MASK),
+                    ColorStateList.valueOf(this.neutral2.s500).withLStar(80f).colors[0],
+                    setAlphaComponent(this.accent2.s500, ALPHA_MASK)
+                )
+            else ->
+                intArrayOf(
+                    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)
+                )
+        }
     }
 
     /**
@@ -234,12 +244,7 @@
      */
     @ColorInt
     private fun ColorScheme.getDarkColorPreview(): IntArray {
-        return intArrayOf(
-            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)
-        )
+        return getLightColorPreview()
     }
 
     private fun ColorScheme.getPresetColorPreview(seed: Int): IntArray {