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

Merge "Don't expand the panel on ACTION_CANCEL if the keyguard is fading away." into sc-v2-dev am: 0363d75290

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

Change-Id: I74f79586df90d77f41548c005f81076ce5a8a515
This commit is contained in:
TreeHugger Robot
2021-10-19 22:37:43 +00:00
committed by Automerger Merge Worker
parent 09c1d2fad9 0363d75290
commit 44783e473b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,6 +396,12 @@ public abstract class PanelViewController {
expand = false;
} else if (onKeyguard) {
expand = true;
} else if (mKeyguardStateController.isKeyguardFadingAway()) {
// If we're in the middle of dismissing the keyguard, don't expand due to the
// cancelled gesture. Gesture cancellation during an unlock is expected in some
// situations, such keeping your finger down while swiping to unlock to an app
// that is locked in landscape (the rotation will cancel the touch event).
expand = false;
} else {
// If we get a cancel, put the shade back to the state it was in when the
// gesture started