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

Commit 99fbce8e authored by Pat Manning's avatar Pat Manning Committed by Automerger Merge Worker
Browse files

Merge "Add test to dismiss AllApps by swipe up to home gesture." into udc-qpr-dev am: bbf481b6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24404201



Change-Id: I1396e7039a549efa1cc7dfc89865e24a849c8f23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3165605 bbf481b6

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+12 −1
Original line number Diff line number Diff line
@@ -229,7 +229,18 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    @PortraitLandscape

    public void testAllAppsSwitchToWorkspace() {

        assertNotNull("switchToWorkspace() returned null",

                mLauncher.getWorkspace().switchToAllApps().switchToWorkspace());

                mLauncher.getWorkspace().switchToAllApps()

                        .switchToWorkspace(/* swipeDown= */ true));

        assertTrue("Launcher internal state is not Workspace",

                isInState(() -> LauncherState.NORMAL));

    }



    @Test

    @PortraitLandscape

    public void testAllAppsSwipeUpToWorkspace() {

        assertNotNull("testAllAppsSwipeUpToWorkspace() returned null",

                mLauncher.getWorkspace().switchToAllApps()

                        .switchToWorkspace(/* swipeDown= */ false));

        assertTrue("Launcher internal state is not Workspace",

                isInState(() -> LauncherState.NORMAL));

    }

tests/tapl/com/android/launcher3/tapl/HomeAllApps.java

+13 −6
Original line number Diff line number Diff line
@@ -30,23 +30,28 @@ public class HomeAllApps extends AllApps { 
    }



    /**

     * Swipes down to Workspace.

     * Swipes up or down to dismiss to Workspace.

     * @param swipeDown Swipe all apps down to dismiss, otherwise swipe up to dismiss by going home.

     *

     * @return the Workspace object.

     */

    @NonNull

    public Workspace switchToWorkspace() {

    public Workspace switchToWorkspace(boolean swipeDown) {

        try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();

             LauncherInstrumentation.Closable c =

                     mLauncher.addContextLayer("want to switch from all apps to workspace")) {

            UiObject2 allAppsContainer = verifyActiveContainer();



            final int startX = allAppsContainer.getVisibleCenter().x;

            final int startY = getTopVisibleIconBounds(allAppsContainer).centerY();

            final int endY = mLauncher.getDevice().getDisplayHeight();

            final int startY = swipeDown ? getTopVisibleIconBounds(allAppsContainer).centerY()

                    : mLauncher.getDevice().getDisplayHeight();

            final int endY =

                    swipeDown ? mLauncher.getDevice().getDisplayHeight() : getTopVisibleIconBounds(

                            allAppsContainer).centerY();

            LauncherInstrumentation.log(

                    "switchToWorkspace: startY = " + startY + ", endY = " + endY

                            + ", slop = " + mLauncher.getTouchSlop());

                            + ", slop = " + mLauncher.getTouchSlop()

                            + ", swipeDown = " + swipeDown);



            mLauncher.swipeToState(

                    startX,
@@ -54,7 +59,9 @@ public class HomeAllApps extends AllApps { 
                    startX,

                    endY,

                    5 /* steps */,

                    NORMAL_STATE_ORDINAL, LauncherInstrumentation.GestureScope.INSIDE);

                    NORMAL_STATE_ORDINAL,

                    swipeDown ? LauncherInstrumentation.GestureScope.INSIDE

                            : LauncherInstrumentation.GestureScope.OUTSIDE_WITH_PILFER);



            try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(

                    "swiped to workspace")) {