commit fd6d850d72297aa46bdb1137f52731186dccb98d
author Winson Chung <winsonc@google.com> Wed Feb 27 16:40:09 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 27 16:40:09 2019 +0000
tree da59e337cb20335ef6f4ba2eedd71d204549c8a5
parent b47f73919ea4be5a0af84f02e5c1f25abce1a83c
parent 21950c52f8f85057e54635fd87f97f66a096c440

Merge "Adding workaround to defer recents animation cancel" into ub-launcher3-master

Android.mk

diff --git a/Android.mk b/Android.mk
index 628b632..74b96d4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -319,7 +319,7 @@
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_PROGUARD_ENABLED := full
 
-LOCAL_PACKAGE_NAME := Launcher3QuickStepGoIconRecents
+LOCAL_PACKAGE_NAME := Launcher3GoIconRecents
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
 LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3

tests/tapl/com/android/launcher3/tapl/OverviewTask.java

diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
index 48686c4..7ccd49b 100644
--- a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
+++ b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
@@ -24,6 +24,7 @@
  * A recent task in the overview panel carousel.
  */
 public final class OverviewTask {
+    static final int FLING_SPEED = 3000;
     private final LauncherInstrumentation mLauncher;
     private final UiObject2 mTask;
     private final BaseOverview mOverview;
@@ -45,7 +46,7 @@
     public void dismiss() {
         verifyActiveContainer();
         // Dismiss the task via flinging it up.
-        mTask.fling(Direction.DOWN);
+        mTask.fling(Direction.DOWN, (int) (FLING_SPEED * mLauncher.getDisplayDensity()));
         mLauncher.waitForIdle();
     }