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

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

Change-Id: I29f363203da762f76cfa99a1c40c558ed2b1cc54
This commit is contained in:
Jorge Gil
2021-06-30 14:47:47 +00:00
committed by Automerger Merge Worker

View File

@@ -711,6 +711,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