summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-08-03 21:07:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-08-03 21:07:20 +0000
commit589f53cf89788a53f72f451bb50fa0d905da23c0 (patch)
treeb27f9bc145901d2d98d04564b129bd13306025e1 /tests
parent02c33da4d2e255df7908ce7c2225f2c1cf55746f (diff)
parent7acde489553d3edb213908dcce93e465a07e9032 (diff)
downloadandroid_packages_apps_Trebuchet-589f53cf89788a53f72f451bb50fa0d905da23c0.tar.gz
android_packages_apps_Trebuchet-589f53cf89788a53f72f451bb50fa0d905da23c0.tar.bz2
android_packages_apps_Trebuchet-589f53cf89788a53f72f451bb50fa0d905da23c0.zip
Merge "Enabling more checks in TAPL tests." into ub-launcher3-master
Diffstat (limited to 'tests')
-rw-r--r--tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 0be09f0d9..bf8f64efc 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -134,12 +134,14 @@ public final class LauncherInstrumentation {
return waitForLauncherObject(WIDGETS_RES_ID);
}
case ALL_APPS: {
+ waitUntilGone(WORKSPACE_RES_ID);
waitUntilGone(OVERVIEW_RES_ID);
waitUntilGone(WIDGETS_RES_ID);
return waitForLauncherObject(APPS_RES_ID);
}
case OVERVIEW: {
waitForLauncherObject(APPS_RES_ID);
+ waitUntilGone(WORKSPACE_RES_ID);
waitUntilGone(WIDGETS_RES_ID);
return waitForLauncherObject(OVERVIEW_RES_ID);
}