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

Commit 00a52163 authored by Shawn Lee's avatar Shawn Lee
Browse files

Changed swipe up from QQS over keyguard to return to keyguard 

Previously, swiping up from QQS over keyguard was treated like
any swipe up on keyguard, simulatenously dismissing QQS and bringing
up the bouncer/dismissing keyguard if screen is unlocked. The latter
case caused an undesireable transition where launcher was visible
where the notif scrim should be.

Bug: 243908737
Test: manual
Change-Id: I088945b2fc5f90edc4301b1ab6c5bfe0619d5cfb
parent 4300a958

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -2516,7 +2516,7 @@ public final class NotificationPanelViewController implements Dumpable { 
        if (!mSplitShadeEnabled

                && computeQsExpansionFraction() <= 0.01 && getExpandedFraction() < 1.0) {

            mShadeLog.logMotionEvent(event,

                    "handleQsTouch: QQS touched while shade collapsing, QS tracking disabled");

                    "handleQsTouch: shade touched while collapsing, QS tracking disabled");

            mQsTracking = false;

        }

        if (!mQsExpandImmediate && mQsTracking) {

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

+3 −1
Original line number Diff line number Diff line
@@ -1408,12 +1408,14 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        //   to dismiss the lock screen until entering the SIM PIN.

        // - QS is expanded and we're swiping - swiping up now will hide QS, not dismiss the

        //   keyguard.

        // - Shade is in QQS over keyguard - swiping up should take us back to keyguard

        if (!isKeyguardShowing()

                || mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()

                || isOccluded()

                || !mKeyguardStateController.canDismissLockScreen()

                || mKeyguardViewMediator.isAnySimPinSecure()

                || (mNotificationPanelViewController.isQsExpanded() && trackingTouch)) {

                || (mNotificationPanelViewController.isQsExpanded() && trackingTouch)

                || mNotificationPanelViewController.getBarState() == StatusBarState.SHADE_LOCKED) {

            return;

        }