Merge "Cancel ongoing PIP animations in onTaskVanished" into sc-dev am: c794661b9a am: 60ea5943fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15099049 Change-Id: I34d45df18dade9fc29a63f8125c8e4f5d5cdacb9
This commit is contained in:
@@ -711,6 +711,14 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
|
|||||||
if (info.displayId != Display.DEFAULT_DISPLAY && mOnDisplayIdChangeCallback != null) {
|
if (info.displayId != Display.DEFAULT_DISPLAY && mOnDisplayIdChangeCallback != null) {
|
||||||
mOnDisplayIdChangeCallback.accept(Display.DEFAULT_DISPLAY);
|
mOnDisplayIdChangeCallback.accept(Display.DEFAULT_DISPLAY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final PipAnimationController.PipTransitionAnimator animator =
|
||||||
|
mPipAnimationController.getCurrentAnimator();
|
||||||
|
if (animator != null) {
|
||||||
|
animator.removeAllUpdateListeners();
|
||||||
|
animator.removeAllListeners();
|
||||||
|
animator.cancel();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user