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

Commit 5d14f7c0 authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Cancel ongoing PIP animations in onTaskVanished" into sc-dev am: c794661b 

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

Change-Id: I4463064357a3784352f4fae17f423325dd72bff6
parents 69aa41a9 c794661b

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+8 −0
Original line number Diff line number Diff line
@@ -722,6 +722,14 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        if (info.displayId != Display.DEFAULT_DISPLAY && mOnDisplayIdChangeCallback != null) {

            mOnDisplayIdChangeCallback.accept(Display.DEFAULT_DISPLAY);

        }



        final PipAnimationController.PipTransitionAnimator animator =

                mPipAnimationController.getCurrentAnimator();

        if (animator != null) {

            animator.removeAllUpdateListeners();

            animator.removeAllListeners();

            animator.cancel();

        }

    }



    @Override