commit b4bb645304b2a9bfb0c0d97d750c25cc32e457ad
author Colin Cross <ccross@android.com> Wed Dec 15 22:07:27 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 15 22:07:27 2021 +0000
tree 3be194e71456bf4836b8dba5ae7bd53a3f93d873
parent 18c3599e0eb0124a2c3573c24ffb478b418beaed
parent e13ff2cb9a93ab15e061c8dee9c9b645d552a546

Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index b856e0b..a5038a1 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -44,7 +44,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -219,7 +218,6 @@
     }
 
     @Test
-    @Ignore("b/197802324")
     @PortraitLandscape
     public void testAllAppsFromHome() throws Exception {
         // Test opening all apps

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

diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index d8576df..4dd44f4 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -247,7 +247,6 @@
     }
 
     @Test
-    @Ignore("b/197802324")
     @PortraitLandscape
     public void testWidgets() throws Exception {
         // Test opening widgets.