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

Commit 47e0803c authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix contrast of monochrome fixed colors 

Screenshots:
https://screenshot.googleplex.com/4ddevTXDQpRwWPA https://screenshot.googleplex.com/8T4HVfrHHsR9cSD
https://screenshot.googleplex.com/7Wp7k5njCE33n3z
https://screenshot.googleplex.com/7Np6gEXU7utJFsm

Bug: 282951509
Test: atest SystemPaletteTest
Change-Id: I678aea8a09c7b9cf30b437f15c4518415e3de319
parent 35fff40d

packages/SystemUI/monet/src/com/android/systemui/monet/dynamiccolor/MaterialDynamicColors.java

+6 −6
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ public final class MaterialDynamicColors { 
                (s) -> s.primaryPalette,

                (s) -> {

                    if (isMonochrome(s)) {

                        return s.isDark ? 100.0 : 10.0;

                        return 40.0;

                    }

                    return 90.0;

                },
@@ -423,7 +423,7 @@ public final class MaterialDynamicColors { 
                (s) -> s.primaryPalette,

                (s) -> {

                    if (isMonochrome(s)) {

                        return s.isDark ? 90.0 : 20.0;

                        return 30.0;

                    }

                    return 80.0;

                },
@@ -436,7 +436,7 @@ public final class MaterialDynamicColors { 
                (s) -> s.primaryPalette,

                (s) -> {

                    if (isMonochrome(s)) {

                        return s.isDark ? 10.0 : 90.0;

                        return 100.0;

                    }

                    return 10.0;

                },
@@ -449,7 +449,7 @@ public final class MaterialDynamicColors { 
                (s) -> s.primaryPalette,

                (s) -> {

                    if (isMonochrome(s)) {

                        return s.isDark ? 30.0 : 70.0;

                        return 90.0;

                    }

                    return 30.0;

                },
@@ -497,13 +497,13 @@ public final class MaterialDynamicColors { 
    @NonNull

    public DynamicColor onTertiaryFixed() {

        return DynamicColor.fromPalette(

                (s) -> s.tertiaryPalette, (s) -> isMonochrome(s) ? 90.0 : 10.0, (s) -> tertiaryFixedDim());

                (s) -> s.tertiaryPalette, (s) -> isMonochrome(s) ? 100.0 : 10.0, (s) -> tertiaryFixedDim());

    }



    @NonNull

    public DynamicColor onTertiaryFixedVariant() {

        return DynamicColor.fromPalette(

                (s) -> s.tertiaryPalette, (s) -> isMonochrome(s) ? 70.0 : 30.0, (s) -> tertiaryFixedDim());

                (s) -> s.tertiaryPalette, (s) -> isMonochrome(s) ? 90.0 : 30.0, (s) -> tertiaryFixedDim());

    }



    /**