commit a2e095c93c0a1c39a855df6c3f95175ea7858334
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Sep 18 21:15:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 18 21:15:17 2018 +0000
tree d9e40f93bcd6b0318e5923d57ba6dc8c39bd1b4e
parent 24b209c65a953f6e906dd6f36da9a6c790bf196a
parent c59465efe018d6703120ff319c118baf55caf92d

Merge "Disabling heads-up notifications in launcher tests." into ub-launcher3-master

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index d450366..5a3d36d 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -56,6 +56,7 @@
 import com.android.launcher3.util.Wait;
 import com.android.launcher3.util.rule.LauncherActivityRule;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 
@@ -94,6 +95,12 @@
         mLauncher = new LauncherInstrumentation(getInstrumentation());
         mTargetContext = InstrumentationRegistry.getTargetContext();
         mTargetPackage = mTargetContext.getPackageName();
+        mDevice.executeShellCommand("settings put global heads_up_notifications_enabled 0");
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        mDevice.executeShellCommand("settings put global heads_up_notifications_enabled 1");
     }
 
     protected void lockRotation(boolean naturalOrientation) throws RemoteException {

tests/src/com/android/launcher3/ui/WorkTabTest.java

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index 044b7f3..efbab0c 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -54,6 +54,7 @@
     @After
     public void removeWorkProfile() throws Exception {
         mDevice.executeShellCommand("pm remove-user " + mProfileUserId);
+        super.tearDown();
     }
 
     @Test

tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java

diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
index 0dc9b2e..17fdd26 100644
--- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
@@ -103,6 +103,8 @@
         if (mSessionId > -1) {
             mTargetContext.getPackageManager().getPackageInstaller().abandonSession(mSessionId);
         }
+
+        super.tearDown();
     }
 
     @Test