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

Commit 7ea16d62 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Match SFPS Keyguard color to the bouncer secondary color" into... 

Merge "Match SFPS Keyguard color to the bouncer secondary color" into tm-qpr-dev am: 106aa99d am: 2c4a1b33

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



Change-Id: I83ed67ee2c652ecbd293d29b58ebc35a2debe488
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d969cfe 2c4a1b33

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

+8 −4
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ constructor( 
            scope.launch {

                alternateBouncerInteractor.isVisible.collect { isVisible: Boolean ->

                    if (isVisible) {

                        show(SideFpsUiRequestSource.ALTERNATE_BOUNCER)

                        show(SideFpsUiRequestSource.ALTERNATE_BOUNCER, REASON_AUTH_KEYGUARD)

                    } else {

                        hide(SideFpsUiRequestSource.ALTERNATE_BOUNCER)

                    }
@@ -436,13 +436,17 @@ private fun LottieAnimationView.addOverlayDynamicColor( 
    @BiometricOverlayConstants.ShowReason reason: Int

) {

    fun update() {

        val c = context.getColor(R.color.biometric_dialog_accent)

        val chevronFill = context.getColor(R.color.sfps_chevron_fill)

        val isKeyguard = reason == REASON_AUTH_KEYGUARD

        if (isKeyguard) {

            val color = context.getColor(R.color.numpad_key_color_secondary) // match bouncer color

            val chevronFill =

                com.android.settingslib.Utils.getColorAttrDefaultColor(

                    context,

                    android.R.attr.textColorPrimaryInverse

                )

            for (key in listOf(".blue600", ".blue400")) {

                addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) {

                    PorterDuffColorFilter(c, PorterDuff.Mode.SRC_ATOP)

                    PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)

                }

            }

            addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) {