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

Commit c0c1999e authored by Jordan Silva's avatar Jordan Silva Committed by Android (Google) Code Review
Browse files

Merge "Update TaplOpenCloseAllApps click position to dismiss All Apps" into main

parents 5618e82d 6728f402

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

+6 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer 
    private static final int MAX_SCROLL_ATTEMPTS = 40;



    private static final String BOTTOM_SHEET_RES_ID = "bottom_sheet_background";

    private static final String FAST_SCROLLER_RES_ID = "fast_scroller";



    private static final Pattern EVENT_ALT_ESC_DOWN = Pattern.compile(

            "Key event: KeyEvent.*?action=ACTION_DOWN.*?keyCode=KEYCODE_ESCAPE.*?metaState=0");
@@ -369,9 +370,12 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer 
             LauncherInstrumentation.Closable c = mLauncher.addContextLayer(

                     "want to tap outside AllApps bottom sheet on the "

                             + (tapRight ? "right" : "left"))) {

            final UiObject2 allAppsBottomSheet =



            final UiObject2 container = (tapRight)

                    ? mLauncher.waitForLauncherObject(FAST_SCROLLER_RES_ID) :

                    mLauncher.waitForLauncherObject(BOTTOM_SHEET_RES_ID);

            mLauncher.touchOutsideContainer(allAppsBottomSheet, tapRight);



            mLauncher.touchOutsideContainer(container, tapRight, false);

            try (LauncherInstrumentation.Closable tapped = mLauncher.addContextLayer(

                    "tapped outside AllApps bottom sheet")) {

                verifyVisibleContainerOnDismiss();