summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-10-01 19:48:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-10-01 19:48:05 +0000
commit08776ada1e37c4b424893306c058b1de9f85903f (patch)
tree10e0c2de2c2b445ff25022d5655f38de212be8fc /tests
parent872a380b59c5489b864e9001be899383e6b6bfa0 (diff)
parent7371e4da6846e532592ac14f3a9ab12576a29a1c (diff)
downloadandroid_packages_apps_Trebuchet-08776ada1e37c4b424893306c058b1de9f85903f.tar.gz
android_packages_apps_Trebuchet-08776ada1e37c4b424893306c058b1de9f85903f.tar.bz2
android_packages_apps_Trebuchet-08776ada1e37c4b424893306c058b1de9f85903f.zip
Merge "Waiting for Launcher model load in out-of-proc tests." into ub-launcher3-qt-qpr1-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java3
-rw-r--r--tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java1
2 files changed, 0 insertions, 4 deletions
diff --git a/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java b/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java
index a76b4a488..ff21880d0 100644
--- a/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java
+++ b/tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java
@@ -73,7 +73,6 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest {
// Launch the home activity
mDevice.pressHome();
- waitForModelLoaded();
mLauncher.getWorkspace().getHotseatAppIcon(getSettingsApp().getLabel().toString());
}
@@ -89,7 +88,6 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest {
// Launch the home activity
mDevice.pressHome();
- waitForModelLoaded();
// Verify widget present
assertTrue("Widget is not present",
@@ -106,7 +104,6 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest {
// Launch the home activity
mDevice.pressHome();
- waitForModelLoaded();
mLauncher.getWorkspace().getHotseatFolder("Folder: Copy");
}
diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
index e6348d9c0..f42bf1f3c 100644
--- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
@@ -271,7 +271,6 @@ public class BindWidgetTest extends AbstractLauncherUiTest {
// Launch the home activity
mDevice.pressHome();
- waitForModelLoaded();
}
private void verifyWidgetPresent(LauncherAppWidgetProviderInfo info) {