Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-26 13:19:31 +00:00
committed by Android (Google) Code Review
parent 4e42dc053f 8a35943e5f
commit 442dbd14ff
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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