Merge "Waiting for Normal state after dismissing Home AllApps by touching outside" into main (8d42081b) · Commits · e / os / android_packages_apps_Trebuchet

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()) {

+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");
		}
		}