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

Commit 30d720c0 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 am: 0334b062 am: 3c99cf51

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



Change-Id: I4847188a9160e585d9c6f087ad78614b737bc67d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46e50401 3c99cf51

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

+2 −2
Original line number Diff line number Diff line
@@ -2466,11 +2466,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();
@@ -3151,6 +3150,7 @@ public class BubbleStackView extends FrameLayout 
            }, 0);



            if (!mIsExpansionAnimating) {

                mIsBubbleSwitchAnimating = true;

                mSurfaceSynchronizer.syncSurfaceAndRun(() -> {

                    post(this::animateSwitchBubbles);

                });