Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Josh Tsuji
2023-01-19 19:08:57 +00:00
committed by Android (Google) Code Review
parent a5e45d3124 09114c3e6e
commit 286074d5cf
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -2281,6 +2281,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
} }
if (!mKeyguardDonePending && mHideAnimationRun && !mHideAnimationRunning) { if (!mKeyguardDonePending && mHideAnimationRun && !mHideAnimationRunning) {
handleKeyguardDone(); 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) { } else if (!mHideAnimationRun) {
if (DEBUG) Log.d(TAG, "tryKeyguardDone: starting pre-hide animation"); if (DEBUG) Log.d(TAG, "tryKeyguardDone: starting pre-hide animation");
mHideAnimationRun = true; mHideAnimationRun = true;

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

@@ -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 // Things that mean we're not swiping to dismiss the keyguard, and should ignore this
// expansion: // expansion:
// - Keyguard isn't even visible. // - 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 // - Keyguard is occluded. Expansion changes here are the shade being expanded over the
// occluding activity. // occluding activity.
// - Keyguard is visible, but can't be dismissed (swiping up will show PIN/password prompt). // - 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 // - QS is expanded and we're swiping - swiping up now will hide QS, not dismiss the
// keyguard. // keyguard.
if (!isKeyguardShowing() if (!isKeyguardShowing()
|| mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()
|| isOccluded() || isOccluded()
|| !mKeyguardStateController.canDismissLockScreen() || !mKeyguardStateController.canDismissLockScreen()
|| mKeyguardViewMediator.isAnySimPinSecure() || mKeyguardViewMediator.isAnySimPinSecure()