Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed swipe up from QQS over keyguard to return to keyguard

Browse Source 
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
This commit is contained in:
Shawn Lee
2023-01-19 15:36:13 -08:00
parent 4300a958fe
commit 00a5216334
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -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) {

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

@@ -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;
}