Merge "Revert "Cancel animation whenever MotionEvent.ACTION_DOWN is detected"" into ub-launcher3-calgary
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 536d364..3157c13 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -97,9 +97,6 @@
} 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 @@
@Override
public void onScrollStart(boolean start) {
+ cancelAnimation();
mCurrentAnimation = LauncherAnimUtils.createAnimatorSet();
mShiftStart = mAppsView.getTranslationY();
preparePull(start);