diff options
| author | 2022-12-15 18:49:05 +0000 | |
|---|---|---|
| committer | 2022-12-15 18:49:05 +0000 | |
| commit | 1a9fbfdff7d13d4e8349d2ff0f354562b9c4c183 (patch) | |
| tree | 9193f24ec545594b6e1cbd876adacd0f5213fc43 | |
| parent | 2ed875c177e6b53ceca843298297561b78c1f3ea (diff) | |
| parent | 49fedfb02580d474abf3c76e55f39e86e3aa016f (diff) | |
Merge "Increase animation size and dialog width in BiometricPrompt, and change DT->LT color mapping for better visibility" into tm-qpr-dev am: 49fedfb025
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20715095
Change-Id: Ia361c88a5a6bc80ed66ef318a4c5c66d44aab263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsLib/IllustrationPreference/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/SettingsLib/IllustrationPreference/res/values/colors.xml b/packages/SettingsLib/IllustrationPreference/res/values/colors.xml index 0de7be0a5a08..5d6c343c1fbc 100644 --- a/packages/SettingsLib/IllustrationPreference/res/values/colors.xml +++ b/packages/SettingsLib/IllustrationPreference/res/values/colors.xml @@ -40,6 +40,7 @@ <color name="settingslib_color_grey800">#3c4043</color> <color name="settingslib_color_grey700">#5f6368</color> <color name="settingslib_color_grey600">#80868b</color> + <color name="settingslib_color_grey500">#9AA0A6</color> <color name="settingslib_color_grey400">#bdc1c6</color> <color name="settingslib_color_grey300">#dadce0</color> <color name="settingslib_color_grey200">#e8eaed</color> 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 93b6acc9e160..5e2c43735361 100644 --- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java +++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java @@ -40,10 +40,13 @@ public class LottieColorUtils { HashMap<String, Integer> map = new HashMap<>(); map.put( ".grey600", - R.color.settingslib_color_grey300); + R.color.settingslib_color_grey400); + map.put( + ".grey700", + R.color.settingslib_color_grey500); map.put( ".grey800", - R.color.settingslib_color_grey200); + R.color.settingslib_color_grey300); map.put( ".grey900", R.color.settingslib_color_grey50); |