Merge cherrypicks of [16042083, 16041260, 16042228, 16042360] into sc-qpr1-release

Change-Id: I7fcf031befced6560b2b51832a02d242315e552f
This commit is contained in:
Android Build Coastguard Worker
2021-10-12 21:23:15 +00:00

View File

@@ -2125,6 +2125,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