Merge "Remove lingering content overlays in onTaskVanished" into tm-dev

This commit is contained in:
TreeHugger Robot
2022-05-26 13:19:31 +00:00
committed by Android (Google) Code Review

View File

@@ -801,11 +801,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
"%s: Unrecognized token: %s", TAG, token);
return;
}
onExitPipFinished(info);
if (Transitions.ENABLE_SHELL_TRANSITIONS) {
mPipTransitionController.forceFinishTransition();
}
final PipAnimationController.PipTransitionAnimator<?> animator =
mPipAnimationController.getCurrentAnimator();
if (animator != null) {
@@ -817,6 +813,12 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
animator.removeAllListeners();
animator.cancel();
}
onExitPipFinished(info);
if (Transitions.ENABLE_SHELL_TRANSITIONS) {
mPipTransitionController.forceFinishTransition();
}
}
@Override