summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Weir <justinweir@google.com> 2022-10-05 12:55:46 -0400
committer Justin Weir <justinweir@google.com> 2022-10-12 17:38:55 +0000
commit904553d169341cf9725b320878fbe33be0a9e66b (patch)
tree211b2a1bd5c0ce456e9d19b3bc299bf608022605
parentc47fd5ddad2cde87580ab265131483dede26d947 (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index 11103861f70b..60f1158cc4d5 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);
}