From 93ba4773852d66b151cb388444aee0ea037c2b98 Mon Sep 17 00:00:00 2001
From: Austin Delgado <austindelgado@google.com>
Date: Fri, 21 Jul 2023 12:21:58 -0700
Subject: [PATCH] Update light mode colors for Biometric Prompt UDFPS

Fixes: 288998845
Test: Manual, verified expected colors are shown in light and dark modes
Change-Id: Ib0f31884037d1c2d0055ef2abffc53970bd8c87e
---
 .../IllustrationPreference/res/values/colors.xml         | 2 ++
 .../com/android/settingslib/widget/LottieColorUtils.java | 9 ++++++---
 .../biometrics/AuthBiometricFingerprintIconController.kt | 4 +---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/SettingsLib/IllustrationPreference/res/values/colors.xml b/packages/SettingsLib/IllustrationPreference/res/values/colors.xml
index 5d6c343c1fbc0..accaa67db1fcf 100644
--- a/packages/SettingsLib/IllustrationPreference/res/values/colors.xml
+++ b/packages/SettingsLib/IllustrationPreference/res/values/colors.xml
@@ -25,10 +25,12 @@
     <color name="settingslib_color_blue100">#d2e3fc</color>
     <color name="settingslib_color_blue50">#e8f0fe</color>
     <color name="settingslib_color_green600">#1e8e3e</color>
+    <color name="settingslib_color_green500">#34A853</color>
     <color name="settingslib_color_green400">#5bb974</color>
     <color name="settingslib_color_green100">#ceead6</color>
     <color name="settingslib_color_green50">#e6f4ea</color>
     <color name="settingslib_color_red600">#d93025</color>
+    <color name="settingslib_color_red500">#B3261E</color>
     <color name="settingslib_color_red400">#ee675c</color>
     <color name="settingslib_color_red100">#fad2cf</color>
     <color name="settingslib_color_red50">#fce8e6</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 5e2c437353612..f166a18f528d7 100644
--- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java
+++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java
@@ -41,9 +41,6 @@ public class LottieColorUtils {
         map.put(
                 ".grey600",
                 R.color.settingslib_color_grey400);
-        map.put(
-                ".grey700",
-                R.color.settingslib_color_grey500);
         map.put(
                 ".grey800",
                 R.color.settingslib_color_grey300);
@@ -62,6 +59,12 @@ public class LottieColorUtils {
         map.put(
                 ".green400",
                 R.color.settingslib_color_green600);
+        map.put(
+                ".green200",
+                R.color.settingslib_color_green500);
+        map.put(
+                ".red200",
+                R.color.settingslib_color_red500);
         DARK_TO_LIGHT_THEME_COLOR_MAP = Collections.unmodifiableMap(map);
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt
index 9807b9e6f1b34..f04fdfff67f15 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt
@@ -122,9 +122,7 @@ open class AuthBiometricFingerprintIconController(
         if (shouldAnimateIconViewForTransition(lastState, newState)) {
             iconView.playAnimation()
         }
-        if (isSideFps) {
-            LottieColorUtils.applyDynamicColors(context, iconView)
-        }
+        LottieColorUtils.applyDynamicColors(context, iconView)
     }
 
     override fun updateIcon(@BiometricState lastState: Int, @BiometricState newState: Int) {