commit ad2188fe9fdef0f388417fc18e066b2b02132702
author Colin Cross <ccross@android.com> Thu Sep 09 22:18:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 09 22:18:34 2021 +0000
tree 478e015403ed361f821f892886008c9d8718f1ee
parent db37d96b8399ea1f19b339c4ce40e3cbbffe7b0c
parent 9b17656ba199f530fef4385e5f2017d954956d17

Merge changes from topic "androidx_drop-sc-dev-plus-aosp" into sc-dev-plus-aosp am: af52aea9a3 am: 9b17656ba1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15689632

Change-Id: I52e46ed8fcc9a47ad97da077ada959a719055ba4

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 e5e560a..e27bc2c 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -42,6 +42,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -212,6 +213,7 @@
     }
 
     @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 881f50c..ea18549 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -250,6 +250,7 @@
     }
 
     @Test
+    @Ignore("b/197802324")
     @PortraitLandscape
     public void testWidgets() throws Exception {
         // Test opening widgets.