Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c480f88 authored by Sergey Serokurov's avatar Sergey Serokurov
Browse files

Do stack collapse after stack reorder 

Bug: 223912200
Test: atest SystemUITests
Change-Id: I10818e9c38c48c60686c16b492f4d0792474037b
parent 49ab8398

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

+5 −6
Original line number Diff line number Diff line
@@ -1225,12 +1225,6 @@ public class BubbleController { 
                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.

            ArrayList<Pair<Bubble, Integer>> removedBubbles =

                    new ArrayList<>(update.removedBubbles);
@@ -1307,6 +1301,11 @@ public class BubbleController { 
                mStackView.updateBubbleOrder(update.bubbles);

            }



            if (update.expandedChanged && !update.expanded) {

                mStackView.setExpanded(false);

                mSysuiProxy.requestNotificationShadeTopUi(false, TAG);

            }



            if (update.selectionChanged && mStackView != null) {

                mStackView.setSelectedBubble(update.selectedBubble);

                if (update.selectedBubble != null) {