diff options
| author | 2022-12-02 19:32:26 +0000 | |
|---|---|---|
| committer | 2022-12-02 19:32:26 +0000 | |
| commit | 5a2fdecfe9a30f030c56547f5900b74951bb5b9a (patch) | |
| tree | 57780da2081a1bc1a395fbd7e5c2fabeffd7803c | |
| parent | 93c881e9dc91e910fb5dc6f69350c77382ae6ecf (diff) | |
| parent | d5822ed0f07c0ed5f04151a7a2d1610ec25d71de (diff) | |
Merge "Fixed contrast with sfps overlay." into tm-qpr-dev am: d5822ed0f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20610989
Change-Id: Ia58caf8fffd5211ddfedba9b0726fd4c90716920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 43f3c9e6e91a..bc88bee41df8 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) { |