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

Commit 329e396f authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge "Convert cream color to charcoal in light theme" into main

parents 53d4757a 929acb14

packages/SettingsLib/Color/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -62,4 +62,5 @@ 
    <color name="settingslib_color_cyan400">#4ecde6</color>

    <color name="settingslib_color_cyan300">#78d9ec</color>

    <color name="settingslib_color_cyan100">#cbf0f8</color>

    <color name="settingslib_color_charcoal">#171717</color>

</resources>

packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ public class LottieColorUtils { 
        map.put(

                ".red200",

                R.color.settingslib_color_red500);

        map.put(

                ".cream",

                R.color.settingslib_color_charcoal);

        DARK_TO_LIGHT_THEME_COLOR_MAP = Collections.unmodifiableMap(map);

    }

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ object LottieColorUtils { 
        ".green400" to R.color.settingslib_color_green600,

        ".green200" to R.color.settingslib_color_green500,

        ".red200" to R.color.settingslib_color_red500,

        ".cream" to R.color.settingslib_color_charcoal

    )



    @Composable