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

Commit 3a7f5458 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Fix issues with unlocking during a swipe on the lockscreen." into tm-qpr-dev am: 286074d5 

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



Change-Id: I91651a4471fbf9a1f21ab896ef2d3ce02676cdf9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26006c72 286074d5

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −0
Original line number Diff line number Diff line
@@ -2281,6 +2281,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        }

        if (!mKeyguardDonePending && mHideAnimationRun && !mHideAnimationRunning) {

            handleKeyguardDone();

        } else if (mSurfaceBehindRemoteAnimationRunning) {

            // We're already running the keyguard exit animation, likely due to an in-progress swipe

            // to unlock.

           exitKeyguardAndFinishSurfaceBehindRemoteAnimation(false /* cancelled */);

        } else if (!mHideAnimationRun) {

            if (DEBUG) Log.d(TAG, "tryKeyguardDone: starting pre-hide animation");

            mHideAnimationRun = true;

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+2 −0
Original line number Diff line number Diff line
@@ -1395,6 +1395,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        // Things that mean we're not swiping to dismiss the keyguard, and should ignore this

        // expansion:

        // - Keyguard isn't even visible.

        // - We're swiping on the bouncer, not the lockscreen.

        // - Keyguard is occluded. Expansion changes here are the shade being expanded over the

        //   occluding activity.

        // - Keyguard is visible, but can't be dismissed (swiping up will show PIN/password prompt).
@@ -1404,6 +1405,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        // - QS is expanded and we're swiping - swiping up now will hide QS, not dismiss the

        //   keyguard.

        if (!isKeyguardShowing()

                || mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()

                || isOccluded()

                || !mKeyguardStateController.canDismissLockScreen()

                || mKeyguardViewMediator.isAnySimPinSecure()