Merge "Fix selection after dismissal" into tm-qpr-dev (7ce3792d) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ import java.math.RoundingMode;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;
		import java.util.Objects;
		import java.util.function.Consumer;
		import java.util.stream.Collectors;

		@@ -2744,8 +2745,10 @@ public class BubbleStackView extends FrameLayout

		private void dismissBubbleIfExists(@Nullable BubbleViewProvider bubble) {
		if (bubble != null && mBubbleData.hasBubbleInStackWithKey(bubble.getKey())) {
		if (mIsExpanded && mBubbleData.getBubbles().size() > 1) {
		// If we have more than 1 bubble we will perform the switch animation
		if (mIsExpanded && mBubbleData.getBubbles().size() > 1
		&& Objects.equals(bubble, mExpandedBubble)) {
		// If we have more than 1 bubble and it's the current bubble being dismissed,
		// we will perform the switch animation
		mIsBubbleSwitchAnimating = true;
		}
		mBubbleData.dismissBubbleWithKey(bubble.getKey(), Bubbles.DISMISS_USER_GESTURE);