Merge "Do not update pointer postion when stack is going to collapse" into tm-qpr-dev (86d2469d) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -1350,14 +1350,18 @@ public class BubbleController {
		mStackView.setBubbleSuppressed(update.unsuppressedBubble, false);
		}

		boolean collapseStack = update.expandedChanged && !update.expanded;

		// At this point, the correct bubbles are inflated in the stack.
		// Make sure the order in bubble data is reflected in bubble row.
		if (update.orderChanged && mStackView != null) {
		mDataRepository.addBubbles(mCurrentUserId, update.bubbles);
		mStackView.updateBubbleOrder(update.bubbles);
		// if the stack is going to be collapsed, do not update pointer position
		// after reordering
		mStackView.updateBubbleOrder(update.bubbles, !collapseStack);
		}

		if (update.expandedChanged && !update.expanded) {
		if (collapseStack) {
		mStackView.setExpanded(false);
		mSysuiProxy.requestNotificationShadeTopUi(false, TAG);
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -1823,7 +1823,7 @@ public class BubbleStackView extends FrameLayout
		/**
		* Update bubble order and pointer position.
		*/
		public void updateBubbleOrder(List<Bubble> bubbles) {
		public void updateBubbleOrder(List<Bubble> bubbles, boolean updatePointerPositoion) {
		final Runnable reorder = () -> {
		for (int i = 0; i < bubbles.size(); i++) {
		Bubble bubble = bubbles.get(i);
		@@ -1839,8 +1839,11 @@ public class BubbleStackView extends FrameLayout
		.map(b -> b.getIconView()).collect(Collectors.toList());
		mStackAnimationController.animateReorder(bubbleViews, reorder);
		}

		if (updatePointerPositoion) {
		updatePointerPosition(false /* forIme */);
		}
		}

		/**
		* Changes the currently selected bubble. If the stack is already expanded, the newly selected