From 99eb28a5567e65a518d19bc29ab6fd23f50fd9dc Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 27 Jun 2016 20:13:55 +0000
Subject: [PATCH] Revert "Cancel animation whenever MotionEvent.ACTION_DOWN is
 detected"

This reverts commit 4325a56f5359a83164692ae6109d6463f792bf13.

Change-Id: If49a4e169b9dad1e833a7d075d67904ef0b671c5
---
 .../launcher3/allapps/AllAppsTransitionController.java        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 536d36463f..3157c133f2 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -97,9 +97,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
             } else if (!mLauncher.isAllAppsVisible() && !shouldPossiblyIntercept(ev)) {
                 mNoIntercept = true;
             } else {
-                // This controller is now going to handle all the touch events.
-                // First cancel any animation that is in progress.
-                cancelAnimation();
                 // Now figure out which direction scroll events the controller will start
                 // calling the callbacks.
                 int conditionsToReportScroll = 0;
@@ -165,6 +162,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
 
     @Override
     public void onScrollStart(boolean start) {
+        cancelAnimation();
         mCurrentAnimation = LauncherAnimUtils.createAnimatorSet();
         mShiftStart = mAppsView.getTranslationY();
         preparePull(start);