diff options
| author | 2022-12-01 17:34:21 +0000 | |
|---|---|---|
| committer | 2022-12-01 18:07:40 +0000 | |
| commit | 9e3c21bae54a894bd6305e7c728e67d800782e23 (patch) | |
| tree | cf71d3d3097b27a7829f5eb77dadbcb747d0eb47 | |
| parent | 6303152e0a68615442a7aa91f6d2cfc2ba1ec645 (diff) | |
Fixed contrast with sfps overlay.
Tested various different themes
1. Choose a color in settings > wallpapers > basic colors
2. Go through enrollment
3. Verify that light/dark theme have appropriate contrast.
Test: Manually verified the contrast works for light/dark themes and
various different basic color styles.
Fixes: 243008680
Change-Id: I63900a8df21a3fe0f02e5da0db6e3b75520fce12
| -rw-r--r-- | packages/SystemUI/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 4ce0852901ff..4133056dcc57 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -133,6 +133,9 @@ <color name="biometric_dialog_accent">@color/material_dynamic_primary40</color> <color name="biometric_dialog_error">#ffd93025</color> <!-- red 600 --> + <!-- SFPS colors --> + <color name="sfps_chevron_fill">@color/material_dynamic_primary90</color> + <!-- UDFPS colors --> <color name="udfps_enroll_icon">#699FF3</color> <color name="udfps_moving_target_fill">#C2D7F7</color> diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt index 1c3dd451a1d3..e09e65e1b479 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt @@ -370,11 +370,15 @@ private fun WindowInsets.hasBigNavigationBar(): Boolean = private fun LottieAnimationView.addOverlayDynamicColor(context: Context) { fun update() { val c = context.getColor(R.color.biometric_dialog_accent) + val chevronFill = context.getColor(R.color.sfps_chevron_fill) for (key in listOf(".blue600", ".blue400")) { addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) { PorterDuffColorFilter(c, PorterDuff.Mode.SRC_ATOP) } } + addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) { + PorterDuffColorFilter(chevronFill, PorterDuff.Mode.SRC_ATOP) + } } if (composition != null) { |