Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a2fdecf authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Fixed contrast with sfps overlay." into tm-qpr-dev am: d5822ed0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20610989



Change-Id: Ia58caf8fffd5211ddfedba9b0726fd4c90716920
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93c881e9 d5822ed0

packages/SystemUI/res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt

+4 −0
Original line number Diff line number Diff line
@@ -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) {