Commit cdfcf6e4 authored Oct 08, 2021 by Winson Chung Committed by Android Build Coastguard Worker Oct 12, 2021

Apply the last recents animation transform on single-activity PIP tasks

- When swiping up to enter PIP w/ auto-enter, SysUI applies a transform
  on the leash which is seamlessly applied to the task (to prevent jumps
  when the leash is removed).  This was intended to be applied in both
  single and multiple activity PIP cases, but if that doesn't happen,
  then when the transform is later cleared, it will inadvertently reset
  the task's crop and matrix.

Bug: 201127015
Test: atest PinnedStackTests
Test: Open YT, enter PIP, turn screen off, turn screen back on
Change-Id: I0d6d46c7c52f7a43058902b50a26131f626ae92d
(cherry picked from commit 54d481de)

parent 75f7b150

services/core/java/com/android/server/wm/RootWindowContainer.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -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