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

Commit f5580bbc authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Separates SFPS and UDFPS BP animation logic" into tm-qpr-dev am: 245bba60 am: fce20389 

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



Change-Id: I7b302063c5076e9005175f2dfc7aaa724c3b36dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2c77b31 fce20389

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

+13 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ open class AuthBiometricFingerprintIconController( 


        iconView.frame = 0

        iconViewOverlay.frame = 0

        if (shouldAnimateIconViewForTransition(lastState, newState)) {

        if (shouldAnimateSfpsIconViewForTransition(lastState, newState)) {

            iconView.playAnimation()

        }
@@ -167,6 +167,18 @@ open class AuthBiometricFingerprintIconController( 
    protected open fun shouldAnimateIconViewForTransition(

            @BiometricState oldState: Int,

            @BiometricState newState: Int

    ) = when (newState) {

        STATE_HELP,

        STATE_ERROR -> true

        STATE_AUTHENTICATING_ANIMATING_IN,

        STATE_AUTHENTICATING -> oldState == STATE_ERROR || oldState == STATE_HELP

        STATE_AUTHENTICATED -> true

        else -> false

    }



    private fun shouldAnimateSfpsIconViewForTransition(

            @BiometricState oldState: Int,

            @BiometricState newState: Int

    ) = when (newState) {

        STATE_HELP,

        STATE_ERROR -> true