Merge "Update leaf freeform task description" into main (a1ffd0d3) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -3066,9 +3066,9 @@ final class ActivityRecord extends WindowToken {

		if (changed && task != null) {
		if (!occludesParent) {
		getRootTask().convertActivityToTranslucent(this);
		task.convertActivityToTranslucent(this);
		} else {
		getRootTask().convertActivityFromTranslucent(this);
		task.convertActivityFromTranslucent(this);
		}
		}
		// Always ensure visibility if this activity doesn't occlude parent, so the

+19 −0

Original line number	Diff line number	Diff line
		@@ -654,6 +654,25 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
		assertThat(mSupervisor.mOpaqueContainerHelper.isOpaque(nonLeafTask)).isFalse();
		}

		@Test
		public void testOpaque_leafTaskUpdated() {
		final Task rootTask = new TaskBuilder(mSupervisor).setCreatedByOrganizer(true).build();
		final TaskFragment opaqueTask = createChildTaskFragment(rootTask,
		WINDOWING_MODE_FREEFORM, /* opaque / true, / filling */ true);
		final Task childTask = new TaskBuilder(mSupervisor).setParentTask(rootTask).build();
		final ActivityRecord directChildActivity = new ActivityBuilder(mAtm).setTask(childTask)
		.build();

		directChildActivity.setOccludesParent(false);

		assertThat(mSupervisor.mOpaqueContainerHelper.isOpaque(childTask)).isFalse();
		assertThat(mSupervisor.mOpaqueContainerHelper.isOpaque(opaqueTask)).isTrue();

		directChildActivity.setOccludesParent(true);

		assertThat(mSupervisor.mOpaqueContainerHelper.isOpaque(childTask)).isTrue();
		}

		@NonNull
		private TaskFragment createChildTaskFragment(@NonNull Task parent,
		@WindowConfiguration.WindowingMode int windowingMode,