Merge "Don't intercept above shelf progress if still animating" into ub-launcher3-edmonton-polish

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager.AnimationComponents;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;

                mCurrentAnimation.getAnimationPlayer().end();

            }

            // If we are already animating from a previous state, we can intercept.

            AllAppsTransitionController allAppsController = mLauncher.getAllAppsController();

            if (ev.getY() >= allAppsController.getShiftRange() * allAppsController.getProgress()) {

                // If we are already animating from a previous state, we can intercept as long as

                // the touch is below the current all apps progress (to allow for double swipe).

                return true;

            }

            // Otherwise, make sure everything is settled and don't intercept so they can scroll

            // recents, dismiss a task, etc.

            if (mAtomicAnim != null) {

                mAtomicAnim.end();

            }

            return false;

        }

        if (mLauncher.isInState(ALL_APPS)) {

            // In all-apps only listen if the container cannot scroll itself

            if (!mLauncher.getAppsView().shouldContainerScroll(ev)) {

    private boolean mCanBlockFling;

    private FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck();

    private AnimatorSet mAtomicAnim;

    protected AnimatorSet mAtomicAnim;

    // True if we want to resume playing atomic components when mAtomicAnim completes.

    private boolean mScheduleResumeAtomicComponent;

    private AutoPlayAtomicAnimationInfo mAtomicAnimAutoPlayInfo;