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

Merge "Do stack collapse after stack reorder" into tm-dev

Browse Source
This commit is contained in:
Sergey Serokurov
2022-04-12 15:49:27 +00:00
committed by Android (Google) Code Review
parent 93599ecf92 2c480f88e2
commit 3ad3650181
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
View File

@@ -1225,12 +1225,6 @@ public class BubbleController {
mOverflowListener.applyUpdate(update); mOverflowListener.applyUpdate(update);
} }
// Collapsing? Do this first before remaining steps.
if (update.expandedChanged && !update.expanded) {
mStackView.setExpanded(false);
mSysuiProxy.requestNotificationShadeTopUi(false, TAG);
}
// Do removals, if any. // Do removals, if any.
ArrayList<Pair<Bubble, Integer>> removedBubbles = ArrayList<Pair<Bubble, Integer>> removedBubbles =
new ArrayList<>(update.removedBubbles); new ArrayList<>(update.removedBubbles);
@@ -1307,6 +1301,11 @@ public class BubbleController {
mStackView.updateBubbleOrder(update.bubbles); mStackView.updateBubbleOrder(update.bubbles);
} }
if (update.expandedChanged && !update.expanded) {
mStackView.setExpanded(false);
mSysuiProxy.requestNotificationShadeTopUi(false, TAG);
}
if (update.selectionChanged && mStackView != null) { if (update.selectionChanged && mStackView != null) {
mStackView.setSelectedBubble(update.selectedBubble); mStackView.setSelectedBubble(update.selectedBubble);
if (update.selectedBubble != null) { if (update.selectedBubble != null) {