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

Commit b2d111d9 authored by Vadim Tryshev's avatar Vadim Tryshev
Browse files

Waiting for Normal state after dismissing Home AllApps by touching outside 

Bug: 313926097
Flag: N/A
Test: presubmit
Change-Id: I4fc90a791d0264aee3b81306fdb1b15814dccfd8
parent df20ea0e

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

+5 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer 
                    ? mLauncher.waitForLauncherObject(FAST_SCROLLER_RES_ID) :

                    mLauncher.waitForLauncherObject(BOTTOM_SHEET_RES_ID);



            mLauncher.touchOutsideContainer(container, tapRight, false);

            touchOutside(tapRight, container);

            try (LauncherInstrumentation.Closable tapped = mLauncher.addContextLayer(

                    "tapped outside AllApps bottom sheet")) {

                verifyVisibleContainerOnDismiss();
@@ -383,6 +383,10 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer 
        }

    }



    protected void touchOutside(boolean tapRight, UiObject2 container) {

        mLauncher.touchOutsideContainer(container, tapRight, false);

    }



    /** Presses the meta keyboard shortcut to dismiss AllApps. */

    public void dismissByKeyboardShortcut() {

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

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

+8 −0
Original line number Diff line number Diff line
@@ -131,4 +131,12 @@ public class HomeAllApps extends AllApps { 
            return new Workspace(mLauncher);

        }

    }



    @Override

    protected void touchOutside(boolean tapRight, UiObject2 container) {

        mLauncher.runToState(

                () -> super.touchOutside(tapRight, container),

                NORMAL_STATE_ORDINAL,

                "touching outside");

    }

}