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

Commit 39521ce7 authored by Pat Manning's avatar Pat Manning
Browse files

Add test to dismiss AllApps by swipe up to home gesture. 

Fix: 292080259
Test: TaplTestsLauncher3
Change-Id: I6053078cbfaf37d26c11376aecd21ba4edcbba44
parent 8648f5f7

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

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

    @PortraitLandscape

    public void testAllAppsSwitchToWorkspace() {

    public void testAllAppsSwitchToWorkspace() {

        assertNotNull("switchToWorkspace() returned null",

        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",

        assertTrue("Launcher internal state is not Workspace",

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

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

    }

    }

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

+13 −6
Original line number Original line 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.

     * @return the Workspace object.

     */

     */

    @NonNull

    @NonNull

    public Workspace switchToWorkspace() {

    public Workspace switchToWorkspace(boolean swipeDown) {

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

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

             LauncherInstrumentation.Closable c =

             LauncherInstrumentation.Closable c =

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

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

            UiObject2 allAppsContainer = verifyActiveContainer();

            UiObject2 allAppsContainer = verifyActiveContainer();





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

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

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

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

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

                    : mLauncher.getDevice().getDisplayHeight();

            final int endY =

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

                            allAppsContainer).centerY();

            LauncherInstrumentation.log(

            LauncherInstrumentation.log(

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

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

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

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

                            + ", swipeDown = " + swipeDown);





            mLauncher.swipeToState(

            mLauncher.swipeToState(

                    startX,

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

                    startX,

                    endY,

                    endY,

                    5 /* steps */,

                    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(

            try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(

                    "swiped to workspace")) {

                    "swiped to workspace")) {