summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-10-01 18:28:46 -0700
committervadimt <vadimt@google.com>2019-10-01 18:28:46 -0700
commit8ecf1b3dd3f944cc2488151111deed7f37fb81f6 (patch)
treed458fe1eaa431ab9c205e2a60a682292c8cc2873 /tests
parent872a380b59c5489b864e9001be899383e6b6bfa0 (diff)
downloadandroid_packages_apps_Trebuchet-8ecf1b3dd3f944cc2488151111deed7f37fb81f6.tar.gz
android_packages_apps_Trebuchet-8ecf1b3dd3f944cc2488151111deed7f37fb81f6.tar.bz2
android_packages_apps_Trebuchet-8ecf1b3dd3f944cc2488151111deed7f37fb81f6.zip
Waiting until context menu goes away after attempting to close it.
Bug: 141770616 Change-Id: I528072e830627d825906ce7c1e3dbb914e2c814e
Diffstat (limited to 'tests')
-rw-r--r--tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java6
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");