diff options
| author | Vadim Tryshev <vadimt@google.com> | 2023-12-12 14:03:45 -0800 |
|---|---|---|
| committer | Vadim Tryshev <vadimt@google.com> | 2023-12-12 14:03:45 -0800 |
| commit | 9c1df6db6b9368ed94fdd13cad955319e374577a (patch) | |
| tree | 687e64ad9642646666b7ea6aacb881464511e580 | |
| parent | 1c7bc492fba8ea97988425707f66c7e165f3c9c6 (diff) | |
| download | Launcher3-9c1df6db6b9368ed94fdd13cad955319e374577a.tar.gz | |
Inserting waiting for settling in the Workspace state after "back" from All Apps
Bug: 313926097
Flag: N/A
Test: presubmit
Change-Id: Idd6e3383be21c2040797148817b96105a6f94fe3
| -rw-r--r-- | tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java | 7 | ||||
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/HomeAllApps.java | 13 |
2 files changed, 17 insertions, 3 deletions
diff --git a/tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java b/tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java index 4a42887b13..b4a5169c30 100644 --- a/tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java +++ b/tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java @@ -208,9 +208,10 @@ public class TaplOpenCloseAllApps extends AbstractLauncherUiTest { InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity( READ_DEVICE_CONFIG_PERMISSION); assumeFalse(FeatureFlags.ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION.get()); - mLauncher.getWorkspace().switchToAllApps(); - mLauncher.pressBack(); - mLauncher.getWorkspace(); + mLauncher + .getWorkspace() + .switchToAllApps() + .pressBackToWorkspace(); waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL); startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); mLauncher.pressBack(); diff --git a/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java b/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java index d9b179c6e7..9ca2dc8463 100644 --- a/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java +++ b/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java @@ -118,4 +118,17 @@ public class HomeAllApps extends AllApps { public boolean isHomeState() { return true; } + + /** Send the "back" gesture to go to workspace. */ + public Workspace pressBackToWorkspace() { + try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck(); + LauncherInstrumentation.Closable c = mLauncher.addContextLayer( + "want to press back from all apps to workspace")) { + mLauncher.runToState( + () -> mLauncher.pressBackImpl(), + NORMAL_STATE_ORDINAL, + "pressing back"); + return new Workspace(mLauncher); + } + } } |