Merge "Refactor WindowTestsBase to use one-task depth activities" (5b3573cf) · Commits · e / os / android_frameworks_base

services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -197,8 +197,7 @@ public class ActivityDisplayTests extends WindowTestsBase {

		// Add activity that should be shown on the keyguard.
		final ActivityRecord showWhenLockedActivity = new ActivityBuilder(mAtm)
		.setCreateTask(true)
		.setStack(stack)
		.setTask(stack)
		.setActivityFlags(FLAG_SHOW_WHEN_LOCKED)
		.build();

		@@ -225,8 +224,8 @@ public class ActivityDisplayTests extends WindowTestsBase {
		final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea();
		final Task alwaysOnTopStack = taskDisplayArea.createStack(WINDOWING_MODE_FREEFORM,
		ACTIVITY_TYPE_STANDARD, true /* onTop */);
		final ActivityRecord activity = new ActivityBuilder(mAtm).setCreateTask(true)
		.setStack(alwaysOnTopStack).build();
		final ActivityRecord activity = new ActivityBuilder(mAtm)
		.setTask(alwaysOnTopStack).build();
		alwaysOnTopStack.setAlwaysOnTop(true);
		taskDisplayArea.positionChildAt(POSITION_TOP, alwaysOnTopStack,
		false /* includingParents */);

services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -362,8 +362,7 @@ public class ActivityMetricsLaunchObserverTests extends WindowTestsBase {
		.setDisplay(addNewDisplayContentAt(DisplayContent.POSITION_BOTTOM))
		.build();
		final ActivityRecord activityOnNewDisplay = new ActivityBuilder(mAtm)
		.setStack(stack)
		.setCreateTask(true)
		.setTask(stack)
		.setProcessName("new")
		.build();

services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -131,8 +131,9 @@ public class ActivityRecordTests extends WindowTestsBase {

		@Before
		public void setUp() throws Exception {
		mStack = new TaskBuilder(mSupervisor).setCreateActivity(true).build();
		mTask = mStack.getBottomMostTask();
		mTask = new TaskBuilder(mSupervisor)
		.setCreateParentTask(true).setCreateActivity(true).build();
		mStack = mTask.getRootTask();
		mActivity = mTask.getTopNonFinishingActivity();

		setBooted(mAtm);
		@@ -787,7 +788,7 @@ public class ActivityRecordTests extends WindowTestsBase {
		// Have two tasks (topRootableTask and mTask) as the children of mStack.
		ActivityRecord topActivity = new ActivityBuilder(mActivity.mAtmService)
		.setCreateTask(true)
		.setStack(mStack)
		.setParentTask(mStack)
		.build();
		Task topRootableTask = topActivity.getTask();
		topRootableTask.moveToFront("test");

services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -71,8 +71,8 @@ public class ActivityStackSupervisorTests extends WindowTestsBase {
		*/
		@Test
		public void testStoppingActivityRemovedWhenResumed() {
		final ActivityRecord firstActivity = new ActivityBuilder(mAtm).setCreateTask(true)
		.setStack(mFullscreenStack).build();
		final ActivityRecord firstActivity = new ActivityBuilder(mAtm)
		.setTask(mFullscreenStack).build();
		mSupervisor.mStoppingActivities.add(firstActivity);

		firstActivity.completeResumeLocked();
		@@ -85,8 +85,8 @@ public class ActivityStackSupervisorTests extends WindowTestsBase {
		*/
		@Test
		public void testReportWaitingActivityLaunchedIfNeeded() {
		final ActivityRecord firstActivity = new ActivityBuilder(mAtm).setCreateTask(true)
		.setStack(mFullscreenStack).build();
		final ActivityRecord firstActivity = new ActivityBuilder(mAtm)
		.setTask(mFullscreenStack).build();

		final WaitResult taskToFrontWait = new WaitResult();
		mSupervisor.mWaitingActivityLaunched.add(taskToFrontWait);
		@@ -153,7 +153,7 @@ public class ActivityStackSupervisorTests extends WindowTestsBase {
		@Test
		public void testNotifyTaskFocusChanged() {
		final ActivityRecord fullScreenActivityA = new ActivityBuilder(mAtm).setCreateTask(true)
		.setStack(mFullscreenStack).build();
		.setParentTask(mFullscreenStack).build();
		final Task taskA = fullScreenActivityA.getTask();

		final TaskChangeNotificationController taskChangeNotifier =
		@@ -166,7 +166,7 @@ public class ActivityStackSupervisorTests extends WindowTestsBase {
		reset(taskChangeNotifier);

		final ActivityRecord fullScreenActivityB = new ActivityBuilder(mAtm).setCreateTask(true)
		.setStack(mFullscreenStack).build();
		.setParentTask(mFullscreenStack).build();
		final Task taskB = fullScreenActivityB.getTask();

		mAtm.setResumedActivityUncheckLocked(fullScreenActivityB, "resumeB");

services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java

+32 −24

Original line number	Diff line number	Diff line
		@@ -242,8 +242,7 @@ public class ActivityStackTests extends WindowTestsBase {
		public void testRemoveOrganizedTask_UpdateStackReference() {
		final Task rootHomeTask = mDefaultTaskDisplayArea.getRootHomeTask();
		final ActivityRecord homeActivity = new ActivityBuilder(mAtm)
		.setStack(rootHomeTask)
		.setCreateTask(true)
		.setTask(rootHomeTask)
		.build();
		final Task secondaryStack = mAtm.mTaskOrganizerController.createRootTask(
		rootHomeTask.getDisplayContent(), WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, null);
		@@ -291,7 +290,7 @@ public class ActivityStackTests extends WindowTestsBase {

		@Test
		public void testStopActivityWhenActivityDestroyed() {
		final ActivityRecord r = new ActivityBuilder(mAtm).setTask(mTask).build();
		final ActivityRecord r = new ActivityBuilder(mAtm).setCreateTask(true).build();
		r.info.flags \|= ActivityInfo.FLAG_NO_HISTORY;
		mStack.moveToFront("testStopActivityWithDestroy");
		r.stopIfPossible();
		@@ -303,7 +302,6 @@ public class ActivityStackTests extends WindowTestsBase {
		public void testFindTaskWithOverlay() {
		final ActivityRecord r = new ActivityBuilder(mAtm)
		.setCreateTask(true)
		.setStack(mStack)
		.setUid(0)
		.build();
		final Task task = r.getTask();
		@@ -314,7 +312,7 @@ public class ActivityStackTests extends WindowTestsBase {

		final RootWindowContainer.FindTaskResult result =
		new RootWindowContainer.FindTaskResult();
		result.process(r, mStack);
		result.process(r, task);

		assertEquals(r, task.getTopNonFinishingActivity(false /* includeOverlays */));
		assertEquals(taskOverlay, task.getTopNonFinishingActivity(true /* includeOverlays */));
		@@ -355,9 +353,11 @@ public class ActivityStackTests extends WindowTestsBase {
		final TaskDisplayArea taskDisplayArea = addNewDisplayContentAt(DisplayContent.POSITION_TOP)
		.getDefaultTaskDisplayArea();
		final Task stack1 = createStackForShouldBeVisibleTest(taskDisplayArea,
		WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */);
		WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */,
		true /* twoLevelTask */);
		final Task stack2 = createStackForShouldBeVisibleTest(taskDisplayArea,
		WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */);
		WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */,
		true /* twoLevelTask */);

		// Do not move display to back because there is still another stack.
		stack2.moveToBack("testMoveStackToBackIncludingParent", stack2.getTopMostTask());
		@@ -377,8 +377,7 @@ public class ActivityStackTests extends WindowTestsBase {
		WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, true /* onTop */);
		// Add an activity to the pinned stack so it isn't considered empty for visibility check.
		final ActivityRecord pinnedActivity = new ActivityBuilder(mAtm)
		.setCreateTask(true)
		.setStack(pinnedStack)
		.setTask(pinnedStack)
		.build();

		assertTrue(homeStack.shouldBeVisible(null /* starting */));
		@@ -676,8 +675,7 @@ public class ActivityStackTests extends WindowTestsBase {
		translucentStack.getVisibility(null /* starting */));
		// Add an activity to the pinned stack so it isn't considered empty for visibility check.
		final ActivityRecord pinnedActivity = new ActivityBuilder(mAtm)
		.setCreateTask(true)
		.setStack(pinnedStack)
		.setTask(pinnedStack)
		.build();
		assertEquals(STACK_VISIBILITY_VISIBLE, pinnedStack.getVisibility(null /* starting */));
		}
		@@ -689,8 +687,7 @@ public class ActivityStackTests extends WindowTestsBase {
		ActivityRecord topRunningHomeActivity = homeStack.topRunningActivity();
		if (topRunningHomeActivity == null) {
		topRunningHomeActivity = new ActivityBuilder(mAtm)
		.setStack(homeStack)
		.setCreateTask(true)
		.setTask(homeStack)
		.build();
		}

		@@ -721,7 +718,7 @@ public class ActivityStackTests extends WindowTestsBase {
		WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */);

		final ActivityRecord firstActivity = new ActivityBuilder(mAtm)
		.setStack(homeStack)
		.setParentTask(homeStack)
		.setCreateTask(true)
		.build();
		final Task task = firstActivity.getTask();
		@@ -985,14 +982,29 @@ public class ActivityStackTests extends WindowTestsBase {
		return stack;
		}

		@SuppressWarnings("TypeParameterUnusedInFormals")
		private Task createStackForShouldBeVisibleTest(
		TaskDisplayArea taskDisplayArea, int windowingMode, int activityType, boolean onTop) {
		return createStackForShouldBeVisibleTest(taskDisplayArea,
		windowingMode, activityType, onTop, false /* twoLevelTask */);
		}

		@SuppressWarnings("TypeParameterUnusedInFormals")
		private Task createStackForShouldBeVisibleTest(TaskDisplayArea taskDisplayArea,
		int windowingMode, int activityType, boolean onTop, boolean twoLevelTask) {
		final Task task;
		if (activityType == ACTIVITY_TYPE_HOME) {
		task = mDefaultTaskDisplayArea.getStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME);
		mDefaultTaskDisplayArea.positionChildAt(onTop ? POSITION_TOP : POSITION_BOTTOM, task,
		false /* includingParents */);
		} else if (twoLevelTask) {
		task = new TaskBuilder(mSupervisor)
		.setTaskDisplayArea(taskDisplayArea)
		.setWindowingMode(windowingMode)
		.setActivityType(activityType)
		.setOnTop(onTop)
		.setCreateActivity(true)
		.setCreateParentTask(true)
		.build().getRootTask();
		} else {
		task = new TaskBuilder(mSupervisor)
		.setTaskDisplayArea(taskDisplayArea)
		@@ -1154,7 +1166,7 @@ public class ActivityStackTests extends WindowTestsBase {
		ActivityRecord activity = homeStack.topRunningActivity();
		if (activity == null) {
		activity = new ActivityBuilder(mAtm)
		.setStack(homeStack)
		.setParentTask(homeStack)
		.setCreateTask(true)
		.build();
		}
		@@ -1319,8 +1331,7 @@ public class ActivityStackTests extends WindowTestsBase {

		@Test
		public void testResetTaskWithFinishingActivities() {
		final ActivityRecord taskTop =
		new ActivityBuilder(mAtm).setStack(mStack).setCreateTask(true).build();
		final ActivityRecord taskTop = new ActivityBuilder(mAtm).setTask(mStack).build();
		// Make all activities in the task are finishing to simulate Task#getTopActivity
		// returns null.
		taskTop.finishing = true;
		@@ -1334,10 +1345,8 @@ public class ActivityStackTests extends WindowTestsBase {
		public void testIterateOccludedActivity() {
		final ArrayList<ActivityRecord> occludedActivities = new ArrayList<>();
		final Consumer<ActivityRecord> handleOccludedActivity = occludedActivities::add;
		final ActivityRecord bottomActivity =
		new ActivityBuilder(mAtm).setStack(mStack).setTask(mTask).build();
		final ActivityRecord topActivity =
		new ActivityBuilder(mAtm).setStack(mStack).setTask(mTask).build();
		final ActivityRecord bottomActivity = new ActivityBuilder(mAtm).setTask(mTask).build();
		final ActivityRecord topActivity = new ActivityBuilder(mAtm).setTask(mTask).build();
		// Top activity occludes bottom activity.
		doReturn(true).when(mStack).shouldBeVisible(any());
		assertTrue(topActivity.shouldBeVisible());
		@@ -1355,8 +1364,7 @@ public class ActivityStackTests extends WindowTestsBase {
		assertThat(occludedActivities).isEmpty();

		// A finishing activity should not occlude other activities behind.
		final ActivityRecord finishingActivity =
		new ActivityBuilder(mAtm).setStack(mStack).setTask(mTask).build();
		final ActivityRecord finishingActivity = new ActivityBuilder(mAtm).setTask(mTask).build();
		finishingActivity.finishing = true;
		doCallRealMethod().when(finishingActivity).occludesParent();
		assertTrue(topActivity.shouldBeVisible());