Merge changes from topic "variants_landing" into tm-dev am: ee74679e85 am: 6019dc9d65

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943620

Change-Id: I3884f0a41e83dacbbe438017d17f8014c65ae2ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt

@@ -225,8 +225,13 @@ class ColorScheme(
     constructor(@ColorInt seed: Int, darkTheme: Boolean):
             this(seed, darkTheme, Style.TONAL_SPOT)
 
-    constructor(wallpaperColors: WallpaperColors, darkTheme: Boolean):
-            this(getSeedColor(wallpaperColors), darkTheme)
+    @JvmOverloads
+    constructor(
+        wallpaperColors: WallpaperColors,
+        darkTheme: Boolean,
+        style: Style = Style.TONAL_SPOT
+    ):
+            this(getSeedColor(wallpaperColors), darkTheme, style)
 
     val allAccentColors: List<Int>
         get() {

packages/SystemUI/tests/src/com/android/systemui/monet/ColorSchemeTest.java

@@ -62,6 +62,16 @@ public class ColorSchemeTest extends SysuiTestCase {
         Assert.assertEquals(rankedSeedColors, List.of(0xffaec00a));
     }
 
+    @Test
+    public void testStyleApplied() {
+        WallpaperColors wallpaperColors = new WallpaperColors(Color.valueOf(0xffaec00a),
+                null, null);
+        // Expressive applies hue rotations to the theme color. The input theme color has hue
+        // 117, ensuring the hue changed significantly is a strong signal styles are being applied.
+        ColorScheme colorScheme = new ColorScheme(wallpaperColors, false, Style.EXPRESSIVE);
+        Assert.assertEquals(Cam.fromInt(colorScheme.getAccent1().get(6)).getHue(), 357.46, 0.1);
+    }
+
 
     @Test
     public void testFiltersInvalidColors() {