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

Merge "Force top UI if we're expanded, per Jorim's suggestion." into rvc-dev am: b20343ffe0 am: d8424668d7 am: 6b75025986

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

Change-Id: I58ba0c5a11091672df73e006b105010a7570b8e2
This commit is contained in:
Josh Tsuji
2020-06-25 15:07:58 +00:00
committed by Automerger Merge Worker
parent 966f60d11d 6b75025986
commit 3a950d70e1
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
View File

@@ -207,6 +207,12 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
/** Whether or not the BubbleStackView has been added to the WindowManager. */ /** Whether or not the BubbleStackView has been added to the WindowManager. */
private boolean mAddedToWindowManager = false; private boolean mAddedToWindowManager = false;
/**
* Value from {@link NotificationShadeWindowController#getForceHasTopUi()} when we forced top UI
* due to expansion. We'll restore this value when the stack collapses.
*/
private boolean mHadTopUi = false;
// Listens to user switch so bubbles can be saved and restored. // Listens to user switch so bubbles can be saved and restored.
private final NotificationLockscreenUserManager mNotifUserManager; private final NotificationLockscreenUserManager mNotifUserManager;
@@ -1291,6 +1297,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
// Collapsing? Do this first before remaining steps. // Collapsing? Do this first before remaining steps.
if (update.expandedChanged && !update.expanded) { if (update.expandedChanged && !update.expanded) {
mStackView.setExpanded(false); mStackView.setExpanded(false);
mNotificationShadeWindowController.setForceHasTopUi(mHadTopUi);
} }
// Do removals, if any. // Do removals, if any.
@@ -1377,6 +1384,8 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
if (update.expandedChanged && update.expanded) { if (update.expandedChanged && update.expanded) {
if (mStackView != null) { if (mStackView != null) {
mStackView.setExpanded(true); mStackView.setExpanded(true);
mHadTopUi = mNotificationShadeWindowController.getForceHasTopUi();
mNotificationShadeWindowController.setForceHasTopUi(true);
} }
} }