Merge "Making SysUiState's QS expansion flag require shade expansion" into tm-qpr-dev am: a2f1ceff96

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

Change-Id: I1fad3acd693e7a2deebb9ded438c002a649b92ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2022-10-12 21:29:01 +00:00
committed by Automerger Merge Worker

View File

@@ -4407,7 +4407,7 @@ public final class NotificationPanelViewController extends PanelViewController {
} }
mSysUiState.setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED, mSysUiState.setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,
isFullyExpanded() && !isInSettings()) isFullyExpanded() && !isInSettings())
.setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED, isInSettings()) .setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED, isFullyExpanded() && isInSettings())
.commitUpdate(mDisplayId); .commitUpdate(mDisplayId);
} }