Merge "Do stack collapse after stack reorder" into tm-dev (3ad36501) · Commits · e / os / android_frameworks_base

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