diff options
| author | 2021-10-11 17:48:30 +0000 | |
|---|---|---|
| committer | 2021-10-11 17:48:30 +0000 | |
| commit | 716a74a819cb9a49c63b045e1cd135fdbca5b90f (patch) | |
| tree | 0fcb61ef42819aef8dee8d6566b7cbf5ecebab22 | |
| parent | e81d0394f797c0105ea35419f533f85b6d12a937 (diff) | |
| parent | 731c558ec1426e978a1f0a3696aa4f5fed205572 (diff) | |
Merge "Apply the last recents animation transform on single-activity PIP tasks" into sc-qpr1-dev am: 731c558ec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16019499
Change-Id: I79df8b973ae2336861556be8d85728a568d0ac17
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 1a881f7a6227..d9f0091bfb76 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -2151,6 +2151,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> final Task rootTask; if (singleActivity) { rootTask = task; + + // Apply the last recents animation leash transform to the task entering PIP + rootTask.maybeApplyLastRecentsAnimationTransaction(); } else { // In the case of multiple activities, we will create a new task for it and then // move the PIP activity into the task. Note that we explicitly defer the task |