Merge "Prevent TaskView's task from getting trimmed by Recents" into main (7f8eef19) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -604,7 +604,6 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener {
		});
		}
		mTaskViewBase.onTaskVanished(taskInfo);
		mTaskOrganizer.setInterceptBackPressedOnTaskRoot(taskInfo.token, false);
		}
		}

		@@ -718,6 +717,9 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener {
		mTaskViewBase.setResizeBgColor(startTransaction, backgroundColor);
		}

		// After the embedded task has appeared, set it to non-trimmable. This is important
		// to prevent recents from trimming and removing the embedded task.
		wct.setTaskTrimmableFromRecents(taskInfo.token, false /* isTrimmableFromRecents */);
		mTaskViewBase.onTaskAppeared(mTaskInfo, mTaskLeash);
		if (mListener != null) {
		final int taskId = mTaskInfo.taskId;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/taskview/TaskViewTest.java

+10 −23

Original line number	Diff line number	Diff line
		@@ -293,16 +293,6 @@ public class TaskViewTest extends ShellTestCase {
		verify(mOrganizer).setInterceptBackPressedOnTaskRoot(eq(mTaskInfo.token), eq(true));
		}

		@Test
		public void testUnsetOnBackPressedOnTaskRoot_legacyTransitions() {
		assumeFalse(Transitions.ENABLE_SHELL_TRANSITIONS);
		mTaskViewTaskController.onTaskAppeared(mTaskInfo, mLeash);
		verify(mOrganizer).setInterceptBackPressedOnTaskRoot(eq(mTaskInfo.token), eq(true));

		mTaskViewTaskController.onTaskVanished(mTaskInfo);
		verify(mOrganizer).setInterceptBackPressedOnTaskRoot(eq(mTaskInfo.token), eq(false));
		}

		@Test
		public void testOnNewTask_noSurface() {
		assumeTrue(Transitions.ENABLE_SHELL_TRANSITIONS);
		@@ -442,19 +432,6 @@ public class TaskViewTest extends ShellTestCase {
		verify(mOrganizer).setInterceptBackPressedOnTaskRoot(eq(mTaskInfo.token), eq(true));
		}

		@Test
		public void testUnsetOnBackPressedOnTaskRoot() {
		assumeTrue(Transitions.ENABLE_SHELL_TRANSITIONS);
		WindowContainerTransaction wct = new WindowContainerTransaction();
		mTaskViewTaskController.prepareOpenAnimation(true /* newTask */,
		new SurfaceControl.Transaction(), new SurfaceControl.Transaction(), mTaskInfo,
		mLeash, wct);
		verify(mOrganizer).setInterceptBackPressedOnTaskRoot(eq(mTaskInfo.token), eq(true));

		mTaskViewTaskController.prepareCloseAnimation();
		verify(mOrganizer).setInterceptBackPressedOnTaskRoot(eq(mTaskInfo.token), eq(false));
		}

		@Test
		public void testSetObscuredTouchRect() {
		mTaskView.setObscuredTouchRect(
		@@ -714,6 +691,16 @@ public class TaskViewTest extends ShellTestCase {
		verify(mTaskView).setResizeBackgroundColor(eq(Color.BLUE));
		}

		@Test
		public void testOnAppeared_setsTrimmableTask() {
		WindowContainerTransaction wct = new WindowContainerTransaction();
		mTaskViewTaskController.prepareOpenAnimation(true /* newTask */,
		new SurfaceControl.Transaction(), new SurfaceControl.Transaction(), mTaskInfo,
		mLeash, wct);

		assertThat(wct.getHierarchyOps().get(0).isTrimmableFromRecents()).isFalse();
		}

		@Test
		public void testMoveToFullscreen_callsTaskRemovalStarted() {
		WindowContainerTransaction wct = new WindowContainerTransaction();