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 am: 442dbd14ff

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

Change-Id: I86eed1bf9b8e9aac2937449dc4acf67e02c145ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-26 15:07:11 +00:00
committed by Automerger Merge Worker
parent b1d3047c1a 442dbd14ff
commit 8debce0dcd
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