Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 136a822e authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Revert "Cancel animation whenever MotionEvent.ACTION_DOWN is detected""... 

Merge "Revert "Cancel animation whenever MotionEvent.ACTION_DOWN is detected"" into ub-launcher3-calgary
parents 5f8fef4b 99eb28a5

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -97,9 +97,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul 
            } else if (!mLauncher.isAllAppsVisible() && !shouldPossiblyIntercept(ev)) {

            } else if (!mLauncher.isAllAppsVisible() && !shouldPossiblyIntercept(ev)) {

                mNoIntercept = true;

                mNoIntercept = true;

            } else {

            } 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

                // Now figure out which direction scroll events the controller will start

                // calling the callbacks.

                // calling the callbacks.

                int conditionsToReportScroll = 0;

                int conditionsToReportScroll = 0;
@@ -165,6 +162,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul 




    @Override

    @Override

    public void onScrollStart(boolean start) {

    public void onScrollStart(boolean start) {

        cancelAnimation();

        mCurrentAnimation = LauncherAnimUtils.createAnimatorSet();

        mCurrentAnimation = LauncherAnimUtils.createAnimatorSet();

        mShiftStart = mAppsView.getTranslationY();

        mShiftStart = mAppsView.getTranslationY();

        preparePull(start);

        preparePull(start);