| commit | 9b17656ba199f530fef4385e5f2017d954956d17 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Sep 09 21:57:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 21:57:04 2021 +0000 |
| tree | bc73582232c0c7dab85b7456d9ac2b08390e57fa | |
| parent | 9713c150f2a30fc5fd4340ee9a9b2fcbd6dffd92 [diff] | |
| parent | af52aea9a32d7970e9f833b3c53357e747f8fc83 [diff] |
Merge changes from topic "androidx_drop-sc-dev-plus-aosp" into sc-dev-plus-aosp am: af52aea9a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15689632 Change-Id: Ibeb279183863d166ba52922437e0a7b73d5bb124
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index a5038a1..b856e0b 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -44,6 +44,7 @@ import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -218,6 +219,7 @@ } @Test + @Ignore("b/197802324") @PortraitLandscape public void testAllAppsFromHome() throws Exception { // Test opening all apps
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index 4dd44f4..d8576df 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -247,6 +247,7 @@ } @Test + @Ignore("b/197802324") @PortraitLandscape public void testWidgets() throws Exception { // Test opening widgets.