Merge "Merge "Synchronize all WindowTestsBase and WindowTestUtils methods."... (6c9d930a) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public class AppWindowTokenTests extends WindowTestsBase {

		mStack = createTaskStackOnDisplay(mDisplayContent);
		mTask = createTaskInStack(mStack, 0 /* userId */);
		mToken = new WindowTestUtils.TestAppWindowToken(mDisplayContent);
		mToken = WindowTestUtils.createTestAppWindowToken(mDisplayContent);

		mTask.addChild(mToken, 0);
		}

services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -193,7 +193,8 @@ public class DisplayContentTests extends WindowTestsBase {
		assertEquals(dc, stack.getDisplayContent());

		final Task task = createTaskInStack(stack, 0 /* userId */);
		final WindowTestUtils.TestAppWindowToken token = new WindowTestUtils.TestAppWindowToken(dc);
		final WindowTestUtils.TestAppWindowToken token = WindowTestUtils.createTestAppWindowToken(
		dc);
		task.addChild(token, 0);
		assertEquals(dc, task.getDisplayContent());
		assertEquals(dc, token.getDisplayContent());
		@@ -265,14 +266,14 @@ public class DisplayContentTests extends WindowTestsBase {
		final TaskStack stack0 = createTaskStackOnDisplay(dc0);
		final Task task0 = createTaskInStack(stack0, 0 /* userId */);
		final WindowTestUtils.TestAppWindowToken token =
		new WindowTestUtils.TestAppWindowToken(dc0);
		WindowTestUtils.createTestAppWindowToken(dc0);
		task0.addChild(token, 0);
		dc0.mTapDetector = new TaskTapPointerEventListener(sWm, dc0);
		sWm.registerPointerEventListener(dc0.mTapDetector);
		final TaskStack stack1 = createTaskStackOnDisplay(dc1);
		final Task task1 = createTaskInStack(stack1, 0 /* userId */);
		final WindowTestUtils.TestAppWindowToken token1 =
		new WindowTestUtils.TestAppWindowToken(dc0);
		WindowTestUtils.createTestAppWindowToken(dc0);
		task1.addChild(token1, 0);
		dc1.mTapDetector = new TaskTapPointerEventListener(sWm, dc0);
		sWm.registerPointerEventListener(dc1.mTapDetector);

services/tests/servicestests/src/com/android/server/wm/DragDropControllerTests.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ public class DragDropControllerTests extends WindowTestsBase {
		* Creates a window state which can be used as a drop target.
		*/
		private WindowState createDropTargetWindow(String name, int ownerId) {
		final WindowTestUtils.TestAppWindowToken token = new WindowTestUtils.TestAppWindowToken(
		final WindowTestUtils.TestAppWindowToken token = WindowTestUtils.createTestAppWindowToken(
		mDisplayContent);
		final TaskStack stack = createStackControllerOnStackOnDisplay(
		WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mDisplayContent).mContainer;

services/tests/servicestests/src/com/android/server/wm/TaskStackContainersTests.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,8 @@ public class TaskStackContainersTests extends WindowTestsBase {
		// Stack should contain visible app window to be considered visible.
		final Task pinnedTask = createTaskInStack(mPinnedStack, 0 /* userId */);
		assertFalse(mPinnedStack.isVisible());
		final WindowTestUtils.TestAppWindowToken pinnedApp = new WindowTestUtils.TestAppWindowToken(
		mDisplayContent);
		final WindowTestUtils.TestAppWindowToken pinnedApp =
		WindowTestUtils.createTestAppWindowToken(mDisplayContent);
		pinnedTask.addChild(pinnedApp, 0 /* addPos */);
		assertTrue(mPinnedStack.isVisible());
		}

services/tests/servicestests/src/com/android/server/wm/TaskStackTests.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -65,13 +65,13 @@ public class TaskStackTests extends WindowTestsBase {
		final TaskStack stack = createTaskStackOnDisplay(mDisplayContent);
		final Task task1 = createTaskInStack(stack, 0 /* userId */);
		WindowTestUtils.TestAppWindowToken appWindowToken1 =
		new WindowTestUtils.TestAppWindowToken(mDisplayContent);
		WindowTestUtils.createTestAppWindowToken(mDisplayContent);
		task1.addChild(appWindowToken1, 0);
		appWindowToken1.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);

		final Task task2 = createTaskInStack(stack, 1 /* userId */);
		WindowTestUtils.TestAppWindowToken appWindowToken2 =
		new WindowTestUtils.TestAppWindowToken(mDisplayContent);
		WindowTestUtils.createTestAppWindowToken(mDisplayContent);
		task2.addChild(appWindowToken2, 0);
		appWindowToken2.setOrientation(SCREEN_ORIENTATION_PORTRAIT);

		@@ -85,13 +85,13 @@ public class TaskStackTests extends WindowTestsBase {
		final TaskStack stack = createTaskStackOnDisplay(mDisplayContent);
		final Task task1 = createTaskInStack(stack, 0 /* userId */);
		WindowTestUtils.TestAppWindowToken appWindowToken1 =
		new WindowTestUtils.TestAppWindowToken(mDisplayContent);
		WindowTestUtils.createTestAppWindowToken(mDisplayContent);
		task1.addChild(appWindowToken1, 0);
		appWindowToken1.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);

		final Task task2 = createTaskInStack(stack, 1 /* userId */);
		WindowTestUtils.TestAppWindowToken appWindowToken2 =
		new WindowTestUtils.TestAppWindowToken(mDisplayContent);
		WindowTestUtils.createTestAppWindowToken(mDisplayContent);
		task2.addChild(appWindowToken2, 0);
		appWindowToken2.setOrientation(SCREEN_ORIENTATION_PORTRAIT);