From 904553d169341cf9725b320878fbe33be0a9e66b Mon Sep 17 00:00:00 2001 From: Justin Weir Date: Wed, 5 Oct 2022 12:55:46 -0400 Subject: [PATCH] Making SysUiState's QS expansion flag require shade expansion The comment for the flag suggests that this should have been in there already. This is a possible fix for b/246273793 if there is a scenario where the shade is collapsed but the QS expansion flag somehow remained set to true. Bug: 246273793 Test: ran atest and manually verified shade CUJs Change-Id: I5867aae1ed2b1094e09d9abb7d6edc2e2a3714f8 --- .../android/systemui/shade/NotificationPanelViewController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 11103861f70b4..60f1158cc4d5e 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -4407,7 +4407,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); }