diff options
| author | vadimt <vadimt@google.com> | 2019-10-03 13:34:28 -0700 |
|---|---|---|
| committer | Vadim Tryshev <vadimt@google.com> | 2019-10-03 20:58:15 +0000 |
| commit | 1ac98548a73e6c82876433c5ab0f037c6da688cd (patch) | |
| tree | ac22e242e3e63404641268402d5f19ccdcfedd9c /tests | |
| parent | 055c22e8e658dcb87447a9c11ec492c2b8e922e5 (diff) | |
| parent | 08776ada1e37c4b424893306c058b1de9f85903f (diff) | |
| download | android_packages_apps_Trebuchet-1ac98548a73e6c82876433c5ab0f037c6da688cd.tar.gz android_packages_apps_Trebuchet-1ac98548a73e6c82876433c5ab0f037c6da688cd.tar.bz2 android_packages_apps_Trebuchet-1ac98548a73e6c82876433c5ab0f037c6da688cd.zip | |
resolve merge conflicts of 08776ada1e37c4b424893306c058b1de9f85903f to ub-launcher3-qt-future-dev
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Merged-in: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java | 1 |
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) { |