Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abf3b48d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate tests to use the handle menu to enter desk" into main

parents 1828032e 699cb21d

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ constructor( 
    @Test

    @Test

    open fun enterDesktopWithDrag() {

    open fun enterDesktopWithDrag() {

        // By default this method uses drag to desktop

        // By default this method uses drag to desktop

        testApp.enterDesktopMode(wmHelper, device)

        testApp.enterDesktopMode(wmHelper, device, shouldUseDragToDesktop = true)

    }

    }





    @After

    @After

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ constructor( 
    @Test

    @Test

    open fun reenterDesktopWithDrag() {

    open fun reenterDesktopWithDrag() {

        // By default this method uses drag to desktop

        // By default this method uses drag to desktop

        testApp.enterDesktopMode(wmHelper, device)

        testApp.enterDesktopMode(wmHelper, device, shouldUseDragToDesktop = true)

    }

    }





    @After

    @After

tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt

+5 −1
Original line number Original line Diff line number Diff line
@@ -87,14 +87,18 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) : 
        wmHelper: WindowManagerStateHelper,

        wmHelper: WindowManagerStateHelper,

        device: UiDevice,

        device: UiDevice,

        motionEventHelper: MotionEventHelper = MotionEventHelper(getInstrumentation(), TOUCH),

        motionEventHelper: MotionEventHelper = MotionEventHelper(getInstrumentation(), TOUCH),

        shouldUseDragToDesktop: Boolean = false,

    ) {

    ) {

        innerHelper.launchViaIntent(wmHelper)

        innerHelper.launchViaIntent(wmHelper)

        if (!isInDesktopWindowingMode(wmHelper)) {

        if (isInDesktopWindowingMode(wmHelper)) return

        if (shouldUseDragToDesktop) {

            enterDesktopModeWithDrag(

            enterDesktopModeWithDrag(

                wmHelper = wmHelper,

                wmHelper = wmHelper,

                device = device,

                device = device,

                motionEventHelper = motionEventHelper

                motionEventHelper = motionEventHelper

            )

            )

        } else {

            enterDesktopModeFromAppHandleMenu(wmHelper, device)

        }

        }

    }

    }