From b2d111d90cbdcc543285926da769cc9be8a84660 Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Thu, 4 Jan 2024 14:14:13 -0800 Subject: [PATCH] Waiting for Normal state after dismissing Home AllApps by touching outside Bug: 313926097 Flag: N/A Test: presubmit Change-Id: I4fc90a791d0264aee3b81306fdb1b15814dccfd8 --- tests/tapl/com/android/launcher3/tapl/AllApps.java | 6 +++++- tests/tapl/com/android/launcher3/tapl/HomeAllApps.java | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java index 0e785659a6..3cbc2c28f0 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllApps.java +++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java @@ -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()) { diff --git a/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java b/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java index 9ca2dc8463..11a0cfb1a6 100644 --- a/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java +++ b/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java @@ -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"); + } }