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

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

Merge "Don't expand the panel on ACTION_CANCEL if the keyguard is fading... 

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

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

Change-Id: I74f79586df90d77f41548c005f81076ce5a8a515
parents 09c1d2fa 0363d752

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

+6 −0
Original line number Diff line number Diff line
@@ -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