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

Commit b6f88e4b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't show UDFPS when statusBarState != KEYGUARD" into udc-dev am: d17b0d90 

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



Change-Id: I525129bc4ed56723ff9c5073427123dfa1dea624
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e03e0d0 d17b0d90

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

+7 −4
Original line number Diff line number Diff line
@@ -390,11 +390,14 @@ constructor( 
            return true

        }



        // Only pause auth if we're not on the keyguard AND we're not transitioning to doze

        // (ie: dozeAmount = 0f). For the UnlockedScreenOffAnimation, the statusBarState is

        // Only pause auth if we're not on the keyguard AND we're not transitioning to doze.

        // For the UnlockedScreenOffAnimation, the statusBarState is

        // delayed. However, we still animate in the UDFPS affordance with the

        // mUnlockedScreenOffDozeAnimator.

        if (statusBarState != StatusBarState.KEYGUARD && lastDozeAmount == 0f) {

        // unlockedScreenOffDozeAnimator.

        if (

            statusBarState != StatusBarState.KEYGUARD &&

                !unlockedScreenOffAnimationController.isAnimationPlaying()

        ) {

            return true

        }

        if (isBouncerExpansionGreaterThan(.5f)) {