summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chun-Ku Lin <chunkulin@google.com> 2024-05-15 17:46:52 +0000
committer Chun-Ku Lin <chunkulin@google.com> 2024-05-29 01:46:04 +0000
commit929acb1438053e68b7d27f268e812d1ff442bb2a (patch)
treec564f572a9a43af563c12fd0ca55686eadcb2c35
parent0bd336747122d84310e0404cd5f42de4bf6f0351 (diff)
Convert cream color to charcoal in light theme
Bug: 326229430 Test: manually load the mangification preview page in LT Flag: EXEMPT low risk Change-Id: Idd8d31e1a3faab720e8380f9a2076436d7a259cd
-rw-r--r--packages/SettingsLib/Color/res/values/colors.xml1
-rw-r--r--packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java3
-rw-r--r--packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt1
3 files changed, 5 insertions, 0 deletions
diff --git a/packages/SettingsLib/Color/res/values/colors.xml b/packages/SettingsLib/Color/res/values/colors.xml
index ef0dd1b654b9..7b08a5b60932 100644
--- a/packages/SettingsLib/Color/res/values/colors.xml
+++ b/packages/SettingsLib/Color/res/values/colors.xml
@@ -63,4 +63,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>
diff --git a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java
index bc3488fc31fb..b00ba2d782e5 100644
--- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java
+++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java
@@ -70,6 +70,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);
}
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt
index a6cc3a9a6dd2..e9fed8e2b313 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt
@@ -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