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

Merge "Fixing QS appearing when going from AOD to unlocked in split shade" into tm-qpr-dev am: b495bedbb6

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

Change-Id: I8afbbe21fc7ca8c9132a1ebc75f441a92ba99443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michał Brzeziński
2022-10-05 12:34:33 +00:00
committed by Automerger Merge Worker
parent 4be13a6488 b495bedbb6
commit 3cfa9f553c
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,8 +425,6 @@ public final class NotificationPanelViewController extends PanelViewController {
new KeyguardClockPositionAlgorithm.Result();
private boolean mIsExpanding;
private boolean mBlockTouches;
/**
* Determines if QS should be already expanded when expanding shade.
* Used for split shade, two finger gesture as well as accessibility shortcut to QS.
@@ -1693,7 +1691,6 @@ public final class NotificationPanelViewController extends PanelViewController {
public void resetViews(boolean animate) {
mIsLaunchTransitionFinished = false;
mBlockTouches = false;
mCentralSurfaces.getGutsManager().closeAndSaveGuts(true /* leavebehind */, true /* force */,
true /* controls */, -1 /* x */, -1 /* y */, true /* resetMenu */);
if (animate && !isFullyCollapsed()) {
@@ -4198,7 +4195,7 @@ public final class NotificationPanelViewController extends PanelViewController {
"NPVC onInterceptTouchEvent (" + event.getId() + "): (" + event.getX()
+ "," + event.getY() + ")");
}
if (mBlockTouches || mQs.disallowPanelTouches()) {
if (mQs.disallowPanelTouches()) {
return false;
}
initDownStates(event);
@@ -4241,8 +4238,7 @@ public final class NotificationPanelViewController extends PanelViewController {
}
if (mBlockTouches || (mQsFullyExpanded && mQs != null
&& mQs.disallowPanelTouches())) {
if (mQsFullyExpanded && mQs != null && mQs.disallowPanelTouches()) {
return false;
}

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

@@ -4454,10 +4454,11 @@ public class CentralSurfacesImpl extends CoreStartable implements
Trace.beginSection("CentralSurfaces#updateDozing");
mDozing = isDozing;
// Collapse the notification panel if open
boolean dozingAnimated = mDozeServiceHost.getDozingRequested()
&& mDozeParameters.shouldControlScreenOff();
mNotificationPanelViewController.resetViews(dozingAnimated);
// resetting views is already done when going into doze, there's no need to
// reset them again when we're waking up
mNotificationPanelViewController.resetViews(dozingAnimated && isDozing);
updateQsExpansionEnabled();
mKeyguardViewMediator.setDozing(mDozing);