diff options
| author | Vadim Tryshev <vadimt@google.com> | 2019-10-02 02:00:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-02 02:00:28 +0000 |
| commit | 7c09214298c54bba2071396129c364417e81b73d (patch) | |
| tree | 98e78fb3dab669aedde0c49f9a799090c41d8012 /tests | |
| parent | 08776ada1e37c4b424893306c058b1de9f85903f (diff) | |
| parent | 8ecf1b3dd3f944cc2488151111deed7f37fb81f6 (diff) | |
| download | android_packages_apps_Trebuchet-7c09214298c54bba2071396129c364417e81b73d.tar.gz android_packages_apps_Trebuchet-7c09214298c54bba2071396129c364417e81b73d.tar.bz2 android_packages_apps_Trebuchet-7c09214298c54bba2071396129c364417e81b73d.zip | |
Merge "Waiting until context menu goes away after attempting to close it." into ub-launcher3-qt-qpr1-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 52971d92f..ca15a3cf8 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -550,8 +550,10 @@ public final class LauncherInstrumentation { displaySize.x / 2, displaySize.y - 1, displaySize.x / 2, 0, ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME); - assertTrue("Context menu is still visible after swiping up to home", - !hasLauncherObject("deep_shortcuts_container")); + try (LauncherInstrumentation.Closable c = addContextLayer( + "Swiped up from context menu to home")) { + waitUntilGone("deep_shortcuts_container"); + } } if (hasLauncherObject(WORKSPACE_RES_ID)) { log(action = "already at home"); |