From 00a52163344acde0ab49602274f5391dd33dba8a Mon Sep 17 00:00:00 2001 From: Shawn Lee Date: Thu, 19 Jan 2023 15:36:13 -0800 Subject: 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 --- .../com/android/systemui/shade/NotificationPanelViewController.java | 2 +- .../src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 392a851290de..20a556763afa 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -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) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index dd75d356a60b..f6a06ea67b4b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -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; } -- cgit v1.2.3-59-g8ed1b