commit 95c9eb0685f54153ede472a0773ea77f44370a0c
author Sunny Goyal <sunnygoyal@google.com> Mon Apr 23 19:19:58 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 23 19:19:58 2018 +0000
tree fc43aee77b097a5e2867f364876e2455ed4c9b65
parent 17ab046c250f79f9f649aa0fe269ca642188eaee
parent 34a46f8095f33698673fe05e12a0d707dba62d58

Merge changes from topic "am-f90737be-662f-40f9-a6b1-ce5c6612fc52" into ub-launcher3-master

* changes:
  [automerger] Moving some swipe up complete logic to when the handler is completed. am: 0bbacc705c
  Moving some swipe up complete logic to when the handler is completed.

quickstep/libs/sysui_shared.jar

diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar
index 19a9b17..d2989ef 100644
--- a/quickstep/libs/sysui_shared.jar
+++ b/quickstep/libs/sysui_shared.jar
Binary files differ

quickstep/src/com/android/quickstep/TaskSystemShortcut.java

diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
index e3f6543..a82c679 100644
--- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
@@ -150,15 +150,6 @@
                             }
                         };
 
-                final OnPreDrawListener preDrawListener = new OnPreDrawListener() {
-                    @Override
-                    public boolean onPreDraw() {
-                        taskView.getViewTreeObserver().removeOnPreDrawListener(this);
-                        WindowManagerWrapper.getInstance().endProlongedAnimations();
-                        return true;
-                    }
-                };
-
                 AbstractFloatingView.closeOpenViews(activity, true,
                         AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);
 
@@ -182,7 +173,6 @@
                         //       afterwards
                         recentsView.addIgnoreResetTask(taskView);
                         taskView.setAlpha(0f);
-                        taskView.getViewTreeObserver().addOnPreDrawListener(preDrawListener);
                     };
 
                     final int[] position = new int[2];