Merge "Remove lingering content overlays in onTaskVanished" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
442dbd14ff
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user