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

Commit cd095770 authored Jan 25, 2023 by Shawn Lee Committed by Automerger Merge Worker Jan 25, 2023

Merge "Changed swipe up from QQS over keyguard to return to keyguard" into...

Merge "Changed swipe up from QQS over keyguard to return to keyguard" into tm-qpr-dev am: 1194a7a4 am: 51976e6d

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

Change-Id: I72d8496113f69656fd73be5e37419e8f50e5441f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 028d313b 51976e6d

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
		@@ -1410,12 +1410,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;
		}