diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt index 9ea1e7410de3c..dd45b6f39bddc 100644 --- a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt +++ b/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 get() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/monet/ColorSchemeTest.java b/packages/SystemUI/tests/src/com/android/systemui/monet/ColorSchemeTest.java index 05e83d2d05135..863484b62a004 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/monet/ColorSchemeTest.java +++ b/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() {