Merge \"Revert \"Cancel animation whenever MotionEvent.ACTION_DOWN is detected\"\" into ub-launcher3-calgary

am: 136a822e02

Change-Id: I2efbd5b0b2eeeea9e7bfd7fbc1dc6550ef028beb

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);