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

Commit 15341b79 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge changes from topic "theme-update" into udc-dev am: eefad74d 

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



Change-Id: I6d6a19f51de3c8693259401d2a4851a1f1ad16a0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6466ca7e eefad74d

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

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

                (s) -> s.primaryPalette,

                (s) -> {

                (s) -> {

                    if (isMonochrome(s)) {

                    if (isMonochrome(s)) {

                        return s.isDark ? 100.0 : 10.0;

                        return 40.0;

                    }

                    }

                    return 90.0;

                    return 90.0;

                },

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

                (s) -> s.primaryPalette,

                (s) -> {

                (s) -> {

                    if (isMonochrome(s)) {

                    if (isMonochrome(s)) {

                        return s.isDark ? 90.0 : 20.0;

                        return 30.0;

                    }

                    }

                    return 80.0;

                    return 80.0;

                },

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

                (s) -> s.primaryPalette,

                (s) -> {

                (s) -> {

                    if (isMonochrome(s)) {

                    if (isMonochrome(s)) {

                        return s.isDark ? 10.0 : 90.0;

                        return 100.0;

                    }

                    }

                    return 10.0;

                    return 10.0;

                },

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

                (s) -> s.primaryPalette,

                (s) -> {

                (s) -> {

                    if (isMonochrome(s)) {

                    if (isMonochrome(s)) {

                        return s.isDark ? 30.0 : 70.0;

                        return 90.0;

                    }

                    }

                    return 30.0;

                    return 30.0;

                },

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

    @NonNull

    public DynamicColor onTertiaryFixed() {

    public DynamicColor onTertiaryFixed() {

        return DynamicColor.fromPalette(

        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

    @NonNull

    public DynamicColor onTertiaryFixedVariant() {

    public DynamicColor onTertiaryFixedVariant() {

        return DynamicColor.fromPalette(

        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());

    }

    }





    /**

    /**