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>
This commit is contained in:
Grace Cheng
2022-12-15 18:49:05 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 2 deletions

View File

@@ -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>

View File

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