summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-04-23 21:47:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-23 21:47:38 +0000
commitb31b38c942ea0337b4637e71280f76bdbbf9f132 (patch)
tree592b04cbc6410365723f664e71990690f642ece8 /tests/src
parentdcacfd7d42a344b90dfe5cd80512a7414b122da3 (diff)
parent77b3419ad55a4f9070cbe7d9dcb089dbc2b96114 (diff)
downloadandroid_packages_apps_Trebuchet-b31b38c942ea0337b4637e71280f76bdbbf9f132.tar.gz
android_packages_apps_Trebuchet-b31b38c942ea0337b4637e71280f76bdbbf9f132.tar.bz2
android_packages_apps_Trebuchet-b31b38c942ea0337b4637e71280f76bdbbf9f132.zip
Merge "Adding support for showing predicted apps as a floating row in all-apps and overview" into ub-launcher3-qt-dev
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java2
-rw-r--r--tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index b351ccf89..a37218b17 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -168,7 +168,7 @@ public abstract class AbstractLauncherUiTest {
}
@After
- public void tearDown() {
+ public void verifyLauncherState() {
try {
// Limits UI tests affecting tests running after them.
waitForModelLoaded();
diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
index 918e6e23b..af50190b9 100644
--- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
@@ -103,8 +103,6 @@ public class BindWidgetTest extends AbstractLauncherUiTest {
if (mSessionId > -1) {
mTargetContext.getPackageManager().getPackageInstaller().abandonSession(mSessionId);
}
-
- super.tearDown();
}
@Test