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

Commit fa9675a3 authored by Tony Wickham's avatar Tony Wickham
Browse files

Merging from ub-launcher3-rvc-qpr-dev @ build 6770831 

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-qpr-dev_rvc-qpr-dev_6770831.html

Change-Id: Ic07dd8bd495cd0e013a00a29d9d9f11e246dc568
Merged-In: I5e9c73a7ac3033fe82006c4bd72824f56b8988f8
parents 94dbcefe 107fe60f

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

+7 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides; 


import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;

import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;

import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;

import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
@@ -57,7 +58,7 @@ public final class RecentsViewStateController extends 
            mRecentsView.updateEmptyMessage();

            mRecentsView.resetTaskVisuals();

        }

        setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, state);

        setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, new StateAnimationConfig(), state);

        mRecentsView.setFullscreenProgress(state.getOverviewFullscreenProgress());

    }
@@ -75,17 +76,19 @@ public final class RecentsViewStateController extends 
                    AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));

        }



        setAlphas(builder, toState);

        setAlphas(builder, config, toState);

        builder.setFloat(mRecentsView, FULLSCREEN_PROGRESS,

                toState.getOverviewFullscreenProgress(), LINEAR);

    }



    private void setAlphas(PropertySetter propertySetter, LauncherState state) {

    private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,

            LauncherState state) {

        float buttonAlpha = (state.getVisibleElements(mLauncher) & OVERVIEW_BUTTONS) != 0 ? 1 : 0;

        propertySetter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,

                buttonAlpha, LINEAR);

        propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),

                MultiValueAlpha.VALUE, buttonAlpha, LINEAR);

                MultiValueAlpha.VALUE, buttonAlpha, config.getInterpolator(

                        ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));

    }



    @Override

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+11 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW; 
import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;

import static com.android.launcher3.WorkspaceStateTransitionAnimation.getSpringScaleAnimator;

import static com.android.launcher3.anim.Interpolators.ACCEL;

import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;

import static com.android.launcher3.anim.Interpolators.DEACCEL;

import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
@@ -163,10 +164,15 @@ public class QuickstepAtomicAnimationFactory extends 
            config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);

            config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL);

            config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));

            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL);

            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);



            if (SysUINavigationMode.getMode(mActivity) == NO_BUTTON) {

                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);

            } else {

                config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);

            Workspace workspace = mActivity.getWorkspace();

            }



            Workspace workspace = mActivity.getWorkspace();

            // Start from a higher workspace scale, but only if we're invisible so we don't jump.

            boolean isWorkspaceVisible = workspace.getVisibility() == VISIBLE;

            if (isWorkspaceVisible) {
@@ -206,8 +212,10 @@ public class QuickstepAtomicAnimationFactory extends 
                config.setInterpolator(ANIM_WORKSPACE_SCALE,

                        fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);

                config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);

                config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);

            } else {

                config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);

                config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);



                // Scale up the recents, if it is not coming from the side

                RecentsView overview = mActivity.getOverviewPanel();
@@ -225,7 +233,6 @@ public class QuickstepAtomicAnimationFactory extends 
                    : OVERSHOOT_1_7;

            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, translationInterpolator);

            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, translationInterpolator);

            config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);

        } else if (fromState == HINT_STATE && toState == NORMAL) {

            config.setInterpolator(ANIM_DEPTH, DEACCEL_3);

            if (mHintToNormalDuration == -1) {

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+20 −5
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL; 
import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;

import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;

import static com.android.launcher3.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;

import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;



import android.animation.ValueAnimator;
@@ -45,6 +45,7 @@ import com.android.launcher3.anim.Interpolators; 
import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.graphics.OverviewScrim;

import com.android.launcher3.logging.StatsLogManager;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.testing.TestProtocol;
@@ -52,7 +53,9 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector; 
import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.TouchController;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.util.AssistantUtilities;

import com.android.quickstep.util.OverviewToHomeAnim;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -63,6 +66,8 @@ public class NavBarToHomeTouchController implements TouchController, 
        SingleAxisSwipeDetector.Listener {



    private static final Interpolator PULLBACK_INTERPOLATOR = DEACCEL_3;

    // How much of the overview scrim we can remove during the transition.

    private static final float OVERVIEW_TO_HOME_SCRIM_PROGRESS = 0.5f;



    private final Launcher mLauncher;

    private final SingleAxisSwipeDetector mSwipeDetector;
@@ -156,8 +161,13 @@ public class NavBarToHomeTouchController implements TouchController, 
        final PendingAnimation builder = new PendingAnimation(accuracy);

        if (mStartState.overviewUi) {

            RecentsView recentsView = mLauncher.getOverviewPanel();

            builder.setFloat(recentsView, ADJACENT_PAGE_OFFSET,

                    -mPullbackDistance / recentsView.getPageOffsetScale(), PULLBACK_INTERPOLATOR);

            AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,

                    builder);

            float endScrimAlpha = Utilities.mapRange(OVERVIEW_TO_HOME_SCRIM_PROGRESS,

                    mStartState.getOverviewScrimAlpha(mLauncher),

                    mEndState.getOverviewScrimAlpha(mLauncher));

            builder.setFloat(mLauncher.getDragLayer().getOverviewScrim(),

                    OverviewScrim.SCRIM_PROGRESS, endScrimAlpha, PULLBACK_INTERPOLATOR);

            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

                builder.addOnFrameCallback(

                        () -> recentsView.redrawLiveTile(false /* mightNeedToRefill */));
@@ -212,8 +222,13 @@ public class NavBarToHomeTouchController implements TouchController, 
                recentsView.switchToScreenshot(null,

                        () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));

            }

            if (mStartState == OVERVIEW) {

                new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(mEndState))

                        .animateWithVelocity(velocity);

            } else {

                mLauncher.getStateManager().goToState(mEndState, true,

                        () -> onSwipeInteractionCompleted(mEndState));

            }

            if (mStartState != mEndState) {

                logStateChange(mStartState.containerType, logAction);

            }

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java

+31 −45
Original line number Diff line number Diff line
@@ -21,11 +21,8 @@ import static com.android.launcher3.LauncherState.NORMAL; 
import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.Utilities.EDGE_NAV_BAR;

import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;

import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;



import android.animation.Animator;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.graphics.PointF;
@@ -35,14 +32,15 @@ import android.view.MotionEvent; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.graphics.OverviewScrim;

import com.android.launcher3.statemanager.StateManager;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.VibratorWrapper;

import com.android.quickstep.util.StaggeredWorkspaceAnim;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.util.OverviewToHomeAnim;

import com.android.quickstep.views.RecentsView;



/**
@@ -62,10 +60,10 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 


    private boolean mDidTouchStartInNavBar;

    private boolean mReachedOverview;

    private boolean mIsOverviewRehidden;

    private boolean mIsHomeStaggeredAnimFinished;

    // The last recorded displacement before we reached overview.

    private PointF mStartDisplacement = new PointF();

    private float mStartY;

    private AnimatorPlaybackController mOverviewResistYAnim;



    // Normal to Hint animation has flag SKIP_OVERVIEW, so we update this scrim with this animator.

    private ObjectAnimator mNormalToHintOverviewScrimAnimator;
@@ -123,6 +121,7 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
                    mToState.getOverviewScrimAlpha(mLauncher));

        }

        mReachedOverview = false;

        mOverviewResistYAnim = null;

    }



    @Override
@@ -137,6 +136,11 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
    public void onDragEnd(float velocity) {

        super.onDragEnd(velocity);

        mNormalToHintOverviewScrimAnimator = null;

        if (mLauncher.isInState(OVERVIEW)) {

            // Normally we would cleanup the state based on mCurrentAnimation, but since we stop

            // using that when we pause to go to Overview, we need to clean up ourselves.

            clearState();

        }

    }



    @Override
@@ -160,6 +164,9 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
        mNormalToHintOverviewScrimAnimator = null;

        mCurrentAnimation.dispatchOnCancelWithoutCancelRunnable(() -> {

            mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {

                mOverviewResistYAnim = AnimatorControllerWithResistance

                        .createRecentsResistanceFromOverviewAnim(mLauncher, null)

                        .createPlaybackController();

                mReachedOverview = true;

                maybeSwipeInteractionToOverviewComplete();

            });
@@ -173,13 +180,6 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
        }

    }



    // Used if flinging back to home after reaching overview

    private void maybeSwipeInteractionToHomeComplete() {

        if (mIsHomeStaggeredAnimFinished && mIsOverviewRehidden) {

            onSwipeInteractionCompleted(NORMAL, Touch.FLING);

        }

    }



    @Override

    protected boolean handlingOverviewAnim() {

        return mDidTouchStartInNavBar && super.handlingOverviewAnim();
@@ -193,12 +193,18 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
        if (mMotionPauseDetector.isPaused()) {

            if (!mReachedOverview) {

                mStartDisplacement.set(xDisplacement, yDisplacement);

                mStartY = event.getY();

            } else {

                mRecentsView.setTranslationX((xDisplacement - mStartDisplacement.x)

                        * OVERVIEW_MOVEMENT_FACTOR);

                float yProgress = (mStartDisplacement.y - yDisplacement) / mStartY;

                if (yProgress > 0 && mOverviewResistYAnim != null) {

                    mOverviewResistYAnim.setPlayFraction(yProgress);

                } else {

                    mRecentsView.setTranslationY((yDisplacement - mStartDisplacement.y)

                            * OVERVIEW_MOVEMENT_FACTOR);

                }

            }

            // Stay in Overview.

            return true;

        }
@@ -212,35 +218,8 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
        StateManager<LauncherState> stateManager = mLauncher.getStateManager();

        boolean goToHomeInsteadOfOverview = isFling;

        if (goToHomeInsteadOfOverview) {

            if (velocity > 0) {

                stateManager.goToState(NORMAL, true,

                        () -> onSwipeInteractionCompleted(NORMAL, Touch.FLING));

            } else {

                mIsHomeStaggeredAnimFinished = mIsOverviewRehidden = false;



                StaggeredWorkspaceAnim staggeredWorkspaceAnim = new StaggeredWorkspaceAnim(

                        mLauncher, velocity, false /* animateOverviewScrim */);

                staggeredWorkspaceAnim.addAnimatorListener(new AnimationSuccessListener() {

                    @Override

                    public void onAnimationSuccess(Animator animator) {

                        mIsHomeStaggeredAnimFinished = true;

                        maybeSwipeInteractionToHomeComplete();

                    }

                }).start();



                // StaggeredWorkspaceAnim doesn't animate overview, so we handle it here.

                stateManager.cancelAnimation();

                StateAnimationConfig config = new StateAnimationConfig();

                config.duration = OVERVIEW.getTransitionDuration(mLauncher);

                config.animFlags = PLAY_ATOMIC_OVERVIEW_PEEK;

                AnimatorSet anim = stateManager.createAtomicAnimation(

                        stateManager.getState(), NORMAL, config);

                anim.addListener(AnimationSuccessListener.forRunnable(() -> {

                    mIsOverviewRehidden = true;

                    maybeSwipeInteractionToHomeComplete();

                }));

                anim.start();

            }

            new OverviewToHomeAnim(mLauncher, ()-> onSwipeInteractionCompleted(NORMAL, Touch.FLING))

                    .animateWithVelocity(velocity);

        }

        if (mReachedOverview) {

            float distanceDp = dpiFromPx(Math.max(
@@ -256,6 +235,13 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
                    .withEndAction(goToHomeInsteadOfOverview

                            ? null

                            : this::maybeSwipeInteractionToOverviewComplete);

            if (!goToHomeInsteadOfOverview) {

                // Return to normal properties for the overview state.

                StateAnimationConfig config = new StateAnimationConfig();

                config.duration = duration;

                LauncherState state = mLauncher.getStateManager().getState();

                mLauncher.getStateManager().createAtomicAnimation(state, state, config).start();

            }

        }

    }

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java

+32 −17
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW_BUTTONS; 
import static com.android.launcher3.LauncherState.QUICK_SWITCH;

import static com.android.launcher3.anim.AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD;

import static com.android.launcher3.anim.Interpolators.ACCEL_0_75;

import static com.android.launcher3.anim.Interpolators.DEACCEL;

import static com.android.launcher3.anim.Interpolators.DEACCEL_5;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
@@ -47,6 +46,7 @@ import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK; 
import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;

import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;

import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;

import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;



import android.animation.Animator;
@@ -74,7 +74,9 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction; 
import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.util.VibratorWrapper;

import com.android.quickstep.AnimatedFloat;

import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.util.LayoutUtils;

import com.android.quickstep.util.MotionPauseDetector;

import com.android.quickstep.util.ShelfPeekAnim;
@@ -90,16 +92,17 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
        BothAxesSwipeDetector.Listener, MotionPauseDetector.OnMotionPauseListener {



    /** The minimum progress of the scale/translationY animation until drag end. */

    private static final float Y_ANIM_MIN_PROGRESS = 0.15f;

    private static final float Y_ANIM_MIN_PROGRESS = 0.25f;

    private static final Interpolator FADE_OUT_INTERPOLATOR = DEACCEL_5;

    private static final Interpolator TRANSLATE_OUT_INTERPOLATOR = ACCEL_0_75;

    private static final Interpolator SCALE_DOWN_INTERPOLATOR = DEACCEL;

    private static final Interpolator SCALE_DOWN_INTERPOLATOR = LINEAR;



    private final BaseQuickstepLauncher mLauncher;

    private final BothAxesSwipeDetector mSwipeDetector;

    private final ShelfPeekAnim mShelfPeekAnim;

    private final float mXRange;

    private final float mYRange;

    private final float mMaxYProgress;

    private final MotionPauseDetector mMotionPauseDetector;

    private final float mMotionPauseMinDisplacement;

    private final LauncherRecentsView mRecentsView;
@@ -113,7 +116,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
    // and the other two to set overview properties based on x and y progress.

    private AnimatorPlaybackController mNonOverviewAnim;

    private AnimatorPlaybackController mXOverviewAnim;

    private AnimatorPlaybackController mYOverviewAnim;

    private AnimatedFloat mYOverviewAnim;



    public NoButtonQuickSwitchTouchController(BaseQuickstepLauncher launcher) {

        mLauncher = launcher;
@@ -123,6 +126,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
        mXRange = mLauncher.getDeviceProfile().widthPx / 2f;

        mYRange = LayoutUtils.getShelfTrackingDistance(

            mLauncher, mLauncher.getDeviceProfile(), mRecentsView.getPagedOrientationHandler());

        mMaxYProgress = mLauncher.getDeviceProfile().heightPx / mYRange;

        mMotionPauseDetector = new MotionPauseDetector(mLauncher);

        mMotionPauseMinDisplacement = mLauncher.getResources().getDimension(

                R.dimen.motion_pause_detector_min_displacement_from_app);
@@ -270,8 +274,18 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
                SCALE_DOWN_INTERPOLATOR);

        yAnim.setFloat(mRecentsView, FULLSCREEN_PROGRESS,

                toState.getOverviewFullscreenProgress(), SCALE_DOWN_INTERPOLATOR);

        mYOverviewAnim = yAnim.createPlaybackController();

        mYOverviewAnim.dispatchOnStart();

        AnimatorPlaybackController yNormalController = yAnim.createPlaybackController();

        AnimatorControllerWithResistance yAnimWithResistance = AnimatorControllerWithResistance

                .createForRecents(yNormalController, mLauncher,

                        mRecentsView.getPagedViewOrientedState(), mLauncher.getDeviceProfile(),

                        mRecentsView, RECENTS_SCALE_PROPERTY, mRecentsView,

                        TASK_SECONDARY_TRANSLATION);

        mYOverviewAnim = new AnimatedFloat(() -> {

            if (mYOverviewAnim != null) {

                yAnimWithResistance.setProgress(mYOverviewAnim.value, mMaxYProgress);

            }

        });

        yNormalController.dispatchOnStart();

    }



    @Override
@@ -307,7 +321,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
            mXOverviewAnim.setPlayFraction(xProgress);

        }

        if (mYOverviewAnim != null) {

            mYOverviewAnim.setPlayFraction(yProgress);

            mYOverviewAnim.updateValue(yProgress);

        }

        return true;

    }
@@ -354,9 +368,11 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
        } else if (verticalFling) {

            targetState = velocity.y > 0 ? QUICK_SWITCH : NORMAL;

        } else {

            // If user isn't flinging, just snap to the closest state based on x progress.

            // If user isn't flinging, just snap to the closest state.

            boolean passedHorizontalThreshold = mXOverviewAnim.getInterpolatedProgress() > 0.5f;

            targetState = passedHorizontalThreshold ? QUICK_SWITCH : NORMAL;

            boolean passedVerticalThreshold = mYOverviewAnim.value > 1f;

            targetState = passedHorizontalThreshold && !passedVerticalThreshold

                    ? QUICK_SWITCH : NORMAL;

        }



        // Animate the various components to the target state.
@@ -375,9 +391,9 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 


        boolean flingUpToNormal = verticalFling && velocity.y < 0 && targetState == NORMAL;



        float yProgress = mYOverviewAnim.getProgressFraction();

        float yProgress = mYOverviewAnim.value;

        float startYProgress = Utilities.boundToRange(yProgress

                - velocity.y * getSingleFrameMs(mLauncher) / mYRange, 0f, 1f);

                - velocity.y * getSingleFrameMs(mLauncher) / mYRange, 0f, mMaxYProgress);

        final float endYProgress;

        if (flingUpToNormal) {

            endYProgress = 1;
@@ -387,12 +403,11 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
        } else {

            endYProgress = 0;

        }

        long yDuration = BaseSwipeDetector.calculateDuration(velocity.y,

                Math.abs(endYProgress - startYProgress));

        ValueAnimator yOverviewAnim = mYOverviewAnim.getAnimationPlayer();

        yOverviewAnim.setFloatValues(startYProgress, endYProgress);

        float yDistanceToCover = Math.abs(endYProgress - startYProgress) * mYRange;

        long yDuration = (long) (yDistanceToCover / Math.max(1f, Math.abs(velocity.y)));

        ValueAnimator yOverviewAnim = mYOverviewAnim.animateToValue(startYProgress, endYProgress);

        yOverviewAnim.setDuration(yDuration);

        mYOverviewAnim.dispatchOnStart();

        mYOverviewAnim.updateValue(startYProgress);



        ValueAnimator nonOverviewAnim = mNonOverviewAnim.getAnimationPlayer();

        if (flingUpToNormal && !mIsHomeScreenVisible) {
@@ -457,7 +472,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
            mXOverviewAnim.getAnimationPlayer().cancel();

        }

        if (mYOverviewAnim != null) {

            mYOverviewAnim.getAnimationPlayer().cancel();

            mYOverviewAnim.cancelAnimation();

        }

        mShelfPeekAnim.setShelfState(ShelfAnimState.CANCEL, LINEAR, 0);

        mMotionPauseDetector.clear();