Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update light mode colors for Biometric Prompt UDFPS" into udc-d1-dev

Browse Source
This commit is contained in:
Austin Delgado
2023-07-31 17:11:01 +00:00
committed by Android (Google) Code Review
parent 1e7ed25da4 93ba477385
commit b42dd6f2b7
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/IllustrationPreference/res/values/colors.xml
View File

@@ -25,10 +25,12 @@
<color name="settingslib_color_blue100">#d2e3fc</color> <color name="settingslib_color_blue100">#d2e3fc</color>
<color name="settingslib_color_blue50">#e8f0fe</color> <color name="settingslib_color_blue50">#e8f0fe</color>
<color name="settingslib_color_green600">#1e8e3e</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_green400">#5bb974</color>
<color name="settingslib_color_green100">#ceead6</color> <color name="settingslib_color_green100">#ceead6</color>
<color name="settingslib_color_green50">#e6f4ea</color> <color name="settingslib_color_green50">#e6f4ea</color>
<color name="settingslib_color_red600">#d93025</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_red400">#ee675c</color>
<color name="settingslib_color_red100">#fad2cf</color> <color name="settingslib_color_red100">#fad2cf</color>
<color name="settingslib_color_red50">#fce8e6</color> <color name="settingslib_color_red50">#fce8e6</color>

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

@@ -41,9 +41,6 @@ public class LottieColorUtils {
map.put( map.put(
".grey600", ".grey600",
R.color.settingslib_color_grey400); R.color.settingslib_color_grey400);
map.put(
".grey700",
R.color.settingslib_color_grey500);
map.put( map.put(
".grey800", ".grey800",
R.color.settingslib_color_grey300); R.color.settingslib_color_grey300);
@@ -62,6 +59,12 @@ public class LottieColorUtils {
map.put( map.put(
".green400", ".green400",
R.color.settingslib_color_green600); 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); DARK_TO_LIGHT_THEME_COLOR_MAP = Collections.unmodifiableMap(map);
} }

4
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt
View File

@@ -122,9 +122,7 @@ open class AuthBiometricFingerprintIconController(
if (shouldAnimateIconViewForTransition(lastState, newState)) { if (shouldAnimateIconViewForTransition(lastState, newState)) {
iconView.playAnimation() iconView.playAnimation()
} }
if (isSideFps) { LottieColorUtils.applyDynamicColors(context, iconView)
LottieColorUtils.applyDynamicColors(context, iconView)
}
} }
override fun updateIcon(@BiometricState lastState: Int, @BiometricState newState: Int) { override fun updateIcon(@BiometricState lastState: Int, @BiometricState newState: Int) {