commit 236ef051fded62e9c6ec1196c99f2f30a09ca2f8
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 13 20:52:36 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 13 20:52:36 2019 +0000
tree 986fc89933b1933210f078cd2e470c8d6363c41b
parent fed4d8e8da3b5a992f38f07079ad7dad667601fc
parent 480083490fc000fcde9138f0a879ea20eb8a330c

Merge "Tapl: AllApps: ensuring a minimal vertical size of an icon" into ub-launcher3-master

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

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index ca81343..119288c 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -133,7 +133,7 @@
     @NavigationModeSwitch
     @Test
     public void goToOverviewFromHome() {
-        // b/142828227
+        // b/143488140
         if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&
                 (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {
             return;
@@ -148,7 +148,7 @@
     @NavigationModeSwitch
     @Test
     public void goToOverviewFromApp() {
-        // b/142828227
+        // b/143488140
         if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&
                 (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {
             return;
@@ -187,7 +187,7 @@
     @NavigationModeSwitch
     @Test
     public void testOverview() {
-        // b/142828227
+        // b/143488140
         if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&
                 (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {
             return;

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 5a100c8..429da21 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -351,6 +351,7 @@
      * Custom shortcuts are replaced by deep shortcuts after api 25.
      */
     @Test
+    @Ignore   // b/143725213
     @PortraitLandscape
     public void testDragCustomShortcut() {
         if (!TestHelpers.isInLauncherProcess()) return;     // b/143725213