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

Commit 406e3725 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix an issue where tasks moving to front would collapse the stack."... 

Merge "Fix an issue where tasks moving to front would collapse the stack." into tm-dev am: 13a28fff am: 668dddcd

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



Change-Id: I79f1396257788dfee0f72c4046e01d055a5868b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53f70e14 668dddcd

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

+2 −2
Original line number Diff line number Diff line
@@ -2220,11 +2220,10 @@ public class BubbleStackView extends FrameLayout 
    private void animateSwitchBubbles() {

        // If we're no longer expanded, this is meaningless.

        if (!mIsExpanded) {

            mIsBubbleSwitchAnimating = false;

            return;

        }



        mIsBubbleSwitchAnimating = true;



        // The surface contains a screenshot of the animating out bubble, so we just need to animate

        // it out (and then release the GraphicBuffer).

        PhysicsAnimator.getInstance(mAnimatingOutSurfaceContainer).cancel();
@@ -2838,6 +2837,7 @@ public class BubbleStackView extends FrameLayout 
            }, 0);



            if (!mIsExpansionAnimating) {

                mIsBubbleSwitchAnimating = true;

                mSurfaceSynchronizer.syncSurfaceAndRun(() -> {

                    post(this::animateSwitchBubbles);

                });