Merge "Reset the expanded bubble after dismissing the stack" into main (d0bd4a1a) · Commits · e / os / android_frameworks_base

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

+10 −8

Original line number	Diff line number	Diff line
		@@ -1829,9 +1829,12 @@ public class BubbleStackView extends FrameLayout
		}
		bubble.cleanupViews(); // cleans up the icon view
		updateExpandedView(); // resets state for no expanded bubble
		mExpandedBubble = null;
		});
		logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);
		return;
		} else if (getBubbleCount() == 1) {
		mExpandedBubble = null;
		}
		// Remove it from the views
		for (int i = 0; i < getBubbleCount(); i++) {
		@@ -2420,10 +2423,9 @@ public class BubbleStackView extends FrameLayout
		mExpandedAnimationController.notifyPreparingToCollapse();

		updateOverflowDotVisibility(false /* expanding */);
		final Runnable collapseBackToStack = () -> mExpandedAnimationController.collapseBackToStack(
		mStackAnimationController
		.getStackPositionAlongNearestHorizontalEdge()
		/* collapseTo */,
		final Runnable collapseBackToStack = () ->
		mExpandedAnimationController.collapseBackToStack(
		mStackAnimationController.getStackPositionAlongNearestHorizontalEdge(),
		() -> {
		mBubbleContainer.setActiveController(mStackAnimationController);
		updateOverflowVisibility();