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

Don't expand the keyguard if it's fading away.

Browse Source 
Bug: 196364593
Test: run an app that is locked in landscape, lock the screen, unlock it
Change-Id: I2516e8d2b5b7da0056eeec0b85ed33362f7f3503
This commit is contained in:
Josh Tsuji
2021-10-08 17:34:34 -04:00
parent bb9f5bece8
commit 088de9ff5a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
View File

@@ -385,11 +385,16 @@ public abstract class PanelViewController {
final boolean expand;
if (event.getActionMasked() == MotionEvent.ACTION_CANCEL || forceCancel) {
// If we get a cancel, put the shade back to the state it was in when the gesture
// started
if (onKeyguard) {
// If the keyguard is fading away, don't expand it again. This can happen if you're
// swiping to unlock, the app below the keyguard is in landscape, and the screen
// rotates while your finger is still down after the swipe to unlock.
if (mKeyguardStateController.isKeyguardFadingAway()) {
expand = false;
} else if (onKeyguard) {
expand = true;
} else {
// If we get a cancel, put the shade back to the state it was in when the
// gesture started
expand = !mPanelClosedOnDown;
}
} else {