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

Commit d5939d92 authored by Sergey Serokurov's avatar Sergey Serokurov Committed by Automerger Merge Worker
Browse files

Merge "Do stack collapse after stack reorder" into tm-dev am: 3ad36501 

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



Change-Id: I712a8d95a0a15ba62d47bb0f546f73f8626ccff5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa192493 3ad36501

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) {