Merge "Revert "Ignore broken launcher tests"" into sc-dev
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 785d413..0fe5432 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -42,7 +42,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -216,7 +215,6 @@
return background;
}
- @Ignore
@Test
@PortraitLandscape
public void testAllAppsFromHome() throws Exception {
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index f6a4916..4c9a8e7 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -110,7 +110,6 @@
.launch(mDevice.getLauncherPackageName());
}
- @Ignore
@Test
public void testPressHomeOnAllAppsContextMenu() throws Exception {
final AllApps allApps = mLauncher.getWorkspace().switchToAllApps();
@@ -235,7 +234,6 @@
}
}
- @Ignore
@Test
@PortraitLandscape
public void testAppIconLaunchFromAllAppsFromHome() throws Exception {
@@ -246,7 +244,6 @@
runIconLaunchFromAllAppsTest(this, allApps);
}
- @Ignore
@Test
@PortraitLandscape
public void testWidgets() throws Exception {