Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 2 chroma to vibrant theme's specification

Browse Source 
Bug: 213314628
Test: Manual inspection at runtime
Change-Id: I0f703254ec434f9dac17df7738d704586752143f
This commit is contained in:
James O'Leary
2022-05-05 16:46:57 +00:00
parent 0c38e03bb0
commit 90d0ba5a11
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt
View File

@@ -195,8 +195,8 @@ enum class Style(internal val coreSpec: CoreSpec) {
a1 = TonalSpec(HueSource(), ChromaMinimum(48.0)),
a2 = TonalSpec(HueVibrantSecondary(), ChromaConstant(24.0)),
a3 = TonalSpec(HueVibrantTertiary(), ChromaConstant(32.0)),
n1 = TonalSpec(HueSource(), ChromaConstant(10.0)),
n2 = TonalSpec(HueSource(), ChromaConstant(12.0))
n1 = TonalSpec(HueSource(), ChromaConstant(12.0)),
n2 = TonalSpec(HueSource(), ChromaConstant(14.0))
)),
EXPRESSIVE(CoreSpec(
a1 = TonalSpec(HueAdd(240.0), ChromaConstant(40.0)),

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

@@ -133,7 +133,7 @@ public class ColorSchemeTest extends SysuiTestCase {
Style.VIBRANT /* style */);
int neutralMid = colorScheme.getNeutral1().get(colorScheme.getNeutral1().size() / 2);
Cam cam = Cam.fromInt(neutralMid);
Assert.assertTrue("chroma was " + cam.getChroma(), Math.floor(cam.getChroma()) <= 10.0);
Assert.assertTrue("chroma was " + cam.getChroma(), Math.floor(cam.getChroma()) <= 12.0);
}
@Test