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

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

Merge "Fix enterDesktopWithDrag test" into main

parents 9eea9297 84d80c52

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,8 @@ constructor( 




    @Test

    @Test

    open fun enterDesktopWithDrag() {

    open fun enterDesktopWithDrag() {

        testApp.enterDesktopModeWithDrag(wmHelper, device)

        // By default this method uses drag to desktop

        testApp.enterDesktopMode(wmHelper, device)

    }

    }





    @After

    @After

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -92,7 +92,7 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) : 
    }

    }





    /** Move an app to Desktop by dragging the app handle at the top. */

    /** Move an app to Desktop by dragging the app handle at the top. */

    fun enterDesktopModeWithDrag(

    private fun enterDesktopModeWithDrag(

        wmHelper: WindowManagerStateHelper,

        wmHelper: WindowManagerStateHelper,

        device: UiDevice,

        device: UiDevice,

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

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