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

Commit 1194a7a4 authored by Shawn Lee's avatar Shawn Lee Committed by Android (Google) Code Review
Browse files

Merge "Changed swipe up from QQS over keyguard to return to keyguard" into tm-qpr-dev

parents 289bf4f6 00a52163

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

+1 −1
Original line number Diff line number Diff line
@@ -2518,7 +2518,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;

        }