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

Commit 7ea1f246 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix selection after dismissal" into tm-qpr-dev am: 7ce3792d am: ce9bde0d 

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



Change-Id: I19199b33b662930f0c4cdabf85a80c71434777fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d832d74 ce9bde0d

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