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

Commit 088de9ff authored by Josh Tsuji's avatar Josh Tsuji
Browse files

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

Bug: 196364593
Test: run an app that is locked in landscape, lock the screen, unlock it
Change-Id: I2516e8d2b5b7da0056eeec0b85ed33362f7f3503
parent bb9f5bec

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

+8 −3
Original line number Diff line number Diff line
@@ -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 {