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

Commit 49ed0ef3 authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

Merge "Fix bubble transitions running too early" into main

parents 78f0243f ad7ccea9

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -994,7 +994,7 @@ public class BubbleTransitions { 
                mExpandedViewAnimator.removeViewFromTransition(priorView);

                mExpandedViewAnimator.removeViewFromTransition(priorView);

                mPriorBubble = null;

                mPriorBubble = null;

            }

            }

            if (!animate || mTransitionProgress.isReadyToAnimate()) {

            if (mTransitionProgress.isReadyToAnimate()) {

                playAnimation(animate);

                playAnimation(animate);

            }

            }

        }

        }
@@ -1280,7 +1280,7 @@ public class BubbleTransitions { 
                mExpandedViewAnimator.removeViewFromTransition(priorView);

                mExpandedViewAnimator.removeViewFromTransition(priorView);

                mPriorBubble = null;

                mPriorBubble = null;

            }

            }

            if (!animate || mTransitionProgress.isReadyToAnimate()) {

            if (mTransitionProgress.isReadyToAnimate()) {

                playAnimation(animate);

                playAnimation(animate);

            }

            }

        }

        }