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

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

Change-Id: I14fc97c6adca16175a5be21736cd14a32e91d58e
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:49:08 +00:00
committed by Automerger Merge Worker

View File

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