diff options
3 files changed, 7 insertions, 3 deletions
diff --git a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt index 8d04749d76a5..2115f70faad0 100644 --- a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt +++ b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt @@ -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 diff --git a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDragExistingWindows.kt b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDragExistingWindows.kt index 814478af67c1..9a1919304675 100644 --- a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDragExistingWindows.kt +++ b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDragExistingWindows.kt @@ -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 diff --git a/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt b/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt index 9e9d014c622d..55d6fd9b4a73 100644 --- a/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt +++ b/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt @@ -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) } } |