diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-27 11:51:06 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-27 11:51:06 -0700 |
commit | 4325a56f5359a83164692ae6109d6463f792bf13 (patch) | |
tree | 68b242e06c31cef81887ad57c9ce0d1f21839681 /src/com/android/launcher3/allapps/AllAppsTransitionController.java | |
parent | 1c72b72b21d936bcbf2aad0b090bef7307dac6b3 (diff) | |
download | android_packages_apps_Trebuchet-4325a56f5359a83164692ae6109d6463f792bf13.tar.gz android_packages_apps_Trebuchet-4325a56f5359a83164692ae6109d6463f792bf13.tar.bz2 android_packages_apps_Trebuchet-4325a56f5359a83164692ae6109d6463f792bf13.zip |
Cancel animation whenever MotionEvent.ACTION_DOWN is detected
Change-Id: I130d05907068ecbec12e09207c7ca2e171e90926
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsTransitionController.java')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 3157c133f..536d36463 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -97,6 +97,9 @@ 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; @@ -162,7 +165,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul @Override public void onScrollStart(boolean start) { - cancelAnimation(); mCurrentAnimation = LauncherAnimUtils.createAnimatorSet(); mShiftStart = mAppsView.getTranslationY(); preparePull(start); |