Merge "Migrate tests to use the handle menu to enter desk" into main (abf3b48d) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ constructor(
		@Test
		open fun enterDesktopWithDrag() {
		// By default this method uses drag to desktop
		testApp.enterDesktopMode(wmHelper, device)
		testApp.enterDesktopMode(wmHelper, device, shouldUseDragToDesktop = true)
		}

		@After

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ constructor(
		@Test
		open fun reenterDesktopWithDrag() {
		// By default this method uses drag to desktop
		testApp.enterDesktopMode(wmHelper, device)
		testApp.enterDesktopMode(wmHelper, device, shouldUseDragToDesktop = true)
		}

		@After

+5 −1

Original line number	Diff line number	Diff line
		@@ -87,14 +87,18 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) :
		wmHelper: WindowManagerStateHelper,
		device: UiDevice,
		motionEventHelper: MotionEventHelper = MotionEventHelper(getInstrumentation(), TOUCH),
		shouldUseDragToDesktop: Boolean = false,
		) {
		innerHelper.launchViaIntent(wmHelper)
		if (!isInDesktopWindowingMode(wmHelper)) {
		if (isInDesktopWindowingMode(wmHelper)) return
		if (shouldUseDragToDesktop) {
		enterDesktopModeWithDrag(
		wmHelper = wmHelper,
		device = device,
		motionEventHelper = motionEventHelper
		)
		} else {
		enterDesktopModeFromAppHandleMenu(wmHelper, device)
		}
		}