Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90d0ba5a authored by James O'Leary's avatar James O'Leary
Browse files

Add 2 chroma to vibrant theme's specification 

Bug: 213314628
Test: Manual inspection at runtime
Change-Id: I0f703254ec434f9dac17df7738d704586752143f
parent 0c38e03b

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

+2 −2
Original line number Diff line number Diff line
@@ -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)),

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

+1 −1
Original line number Diff line number Diff line
@@ -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