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

Commit 48010091 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Adjust interpolators when swiping from overview to all apps" into... 

Merge "Adjust interpolators when swiping from overview to all apps" into ub-launcher3-edmonton-polish
parents b0ab8163 17be4e71

quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java

+47 −7
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ package com.android.launcher3.uioverrides; 
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.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;

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

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

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



import android.animation.TimeInterpolator;
@@ -51,6 +55,16 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 


    private static final String TAG = "PortraitStatesTouchCtrl";



    /**

     * The progress at which all apps content will be fully visible when swiping up from overview.

     */

    private static final float ALL_APPS_CONTENT_FADE_THRESHOLD = 0.08f;



    /**

     * The progress at which recents will begin fading out when swiping up from overview.

     */

    private static final float RECENTS_FADE_THRESHOLD = 0.88f;



    private InterpolatorWrapper mAllAppsInterpolatorWrapper = new InterpolatorWrapper();



    // If true, we will finish the current animation instantly on second touch.
@@ -125,7 +139,38 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 


        AnimatorSetBuilder builder = new AnimatorSetBuilder();

        builder.setInterpolator(ANIM_VERTICAL_PROGRESS, mAllAppsInterpolatorWrapper);

        return builder;

    }



    public static AnimatorSetBuilder getOverviewToAllAppsAnimation() {

        AnimatorSetBuilder builder = new AnimatorSetBuilder();

        builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL,

                0, ALL_APPS_CONTENT_FADE_THRESHOLD));

        builder.setInterpolator(ANIM_OVERVIEW_FADE, Interpolators.clampToProgress(DEACCEL,

                RECENTS_FADE_THRESHOLD, 1));

        return builder;

    }



    private AnimatorSetBuilder getAllAppsToOverviewAnimation() {

        AnimatorSetBuilder builder = new AnimatorSetBuilder();

        builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(DEACCEL,

                1 - ALL_APPS_CONTENT_FADE_THRESHOLD, 1));

        builder.setInterpolator(ANIM_OVERVIEW_FADE, Interpolators.clampToProgress(ACCEL,

                0f, 1 - RECENTS_FADE_THRESHOLD));

        return builder;

    }



    @Override

    protected AnimatorSetBuilder getAnimatorSetBuilderForStates(LauncherState fromState,

            LauncherState toState) {

        AnimatorSetBuilder builder = new AnimatorSetBuilder();

        if (fromState == NORMAL && toState == OVERVIEW) {

            builder = getNormalToOverviewAnimation();

        } else if (fromState == OVERVIEW && toState == ALL_APPS) {

            builder = getOverviewToAllAppsAnimation();

        } else if (fromState == ALL_APPS && toState == OVERVIEW) {

            builder = getAllAppsToOverviewAnimation();

        }

        return builder;

    }
@@ -139,13 +184,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 


        float totalShift = endVerticalShift - startVerticalShift;



        final AnimatorSetBuilder builder;



        if (mFromState == NORMAL && mToState == OVERVIEW && totalShift != 0) {

            builder = getNormalToOverviewAnimation();

        } else {

            builder = new AnimatorSetBuilder();

        }

        final AnimatorSetBuilder builder = totalShift == 0 ? new AnimatorSetBuilder()

                : getAnimatorSetBuilderForStates(mFromState, mToState);



        cancelPendingAnim();

quickstep/src/com/android/quickstep/LongSwipeHelper.java

+7 −2
Original line number Diff line number Diff line
@@ -25,10 +25,13 @@ import android.animation.ValueAnimator; 


import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAnimUtils;

import com.android.launcher3.LauncherStateManager;

import com.android.launcher3.R;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.uioverrides.PortraitStatesTouchController;

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

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

import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
@@ -67,8 +70,10 @@ public class LongSwipeHelper { 
        AllAppsTransitionController controller = mLauncher.getAllAppsController();

        // TODO: Scale it down so that we can reach all-apps in screen space

        mMaxSwipeDistance = Math.max(1, controller.getProgress() * controller.getShiftRange());

        mAnimator = mLauncher.getStateManager()

                .createAnimationToNewWorkspace(ALL_APPS, Math.round(2 * mMaxSwipeDistance));



        AnimatorSetBuilder builder = PortraitStatesTouchController.getOverviewToAllAppsAnimation();

        mAnimator = mLauncher.getStateManager().createAnimationToNewWorkspace(ALL_APPS, builder,

                Math.round(2 * mMaxSwipeDistance), null, LauncherStateManager.ANIM_ALL);

        mAnimator.dispatchOnStart();

    }

quickstep/src/com/android/quickstep/views/ShelfScrimView.java

+5 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.quickstep.views;



import static android.support.v4.graphics.ColorUtils.setAlphaComponent;



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

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

import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -33,6 +32,7 @@ import android.util.AttributeSet; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.util.Themes;

import com.android.launcher3.views.ScrimView;
@@ -55,7 +55,7 @@ public class ShelfScrimView extends ScrimView { 
    // For shelf mode

    private final int mEndAlpha;

    private final float mRadius;

    private final float mMaxScrimAlpha;

    private final int mMaxScrimAlpha;

    private final Paint mPaint;



    // Mid point where the alpha changes
@@ -78,7 +78,7 @@ public class ShelfScrimView extends ScrimView { 


    public ShelfScrimView(Context context, AttributeSet attrs) {

        super(context, attrs);

        mMaxScrimAlpha = OVERVIEW.getWorkspaceScrimAlpha(mLauncher);

        mMaxScrimAlpha = Math.round(OVERVIEW.getWorkspaceScrimAlpha(mLauncher) * 255);



        mEndAlpha = Color.alpha(mEndScrim);

        mRadius = mLauncher.getResources().getDimension(R.dimen.shelf_surface_radius);
@@ -144,9 +144,10 @@ public class ShelfScrimView extends ScrimView { 
        } else {

            mDragHandleOffset += mShiftRange * (mMidProgress - mProgress);



            // Note that these ranges and interpolators are inverted because progress goes 1 to 0.

            int alpha = Math.round(

                    Utilities.mapToRange(mProgress, (float) 0, mMidProgress, (float) mEndAlpha,

                            (float) mMidAlpha, LINEAR));

                            (float) mMidAlpha, Interpolators.clampToProgress(ACCEL, 0.5f, 1f)));

            mShelfColor = setAlphaComponent(mEndScrim, alpha);



            int remainingScrimAlpha = Math.round(

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

+14 −8
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import static com.android.launcher3.LauncherState.ALL_APPS_HEADER; 
import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;

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

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

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;

import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
@@ -151,7 +152,7 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil 
    @Override

    public void setState(LauncherState state) {

        setProgress(state.getVerticalProgress(mLauncher));

        setAlphas(state, NO_ANIM_PROPERTY_SETTER);

        setAlphas(state, null, new AnimatorSetBuilder());

        onProgressAnimationEnd();

    }
@@ -164,7 +165,7 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil 
            AnimatorSetBuilder builder, AnimationConfig config) {

        float targetProgress = toState.getVerticalProgress(mLauncher);

        if (Float.compare(mProgress, targetProgress) == 0) {

            setAlphas(toState, config.getPropertySetter(builder));

            setAlphas(toState, config, builder);

            // Fail fast

            onProgressAnimationEnd();

            return;
@@ -186,19 +187,24 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil 


        builder.play(anim);



        setAlphas(toState, config.getPropertySetter(builder));

        setAlphas(toState, config, builder);

    }



    private void setAlphas(LauncherState toState, PropertySetter setter) {

    private void setAlphas(LauncherState toState, AnimationConfig config,

            AnimatorSetBuilder builder) {

        PropertySetter setter = config == null ? NO_ANIM_PROPERTY_SETTER

                : config.getPropertySetter(builder);

        int visibleElements = toState.getVisibleElements(mLauncher);

        boolean hasHeader = (visibleElements & ALL_APPS_HEADER) != 0;

        boolean hasHeaderExtra = (visibleElements & ALL_APPS_HEADER_EXTRA) != 0;

        boolean hasContent = (visibleElements & ALL_APPS_CONTENT) != 0;



        setter.setViewAlpha(mAppsView.getSearchView(), hasHeader ? 1 : 0, LINEAR);

        setter.setViewAlpha(mAppsView.getContentView(), hasContent ? 1 : 0, LINEAR);

        setter.setViewAlpha(mAppsView.getScrollBar(), hasContent ? 1 : 0, LINEAR);

        mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasContent, setter);

        Interpolator allAppsFade = builder.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR);

        setter.setViewAlpha(mAppsView.getSearchView(), hasHeader ? 1 : 0, allAppsFade);

        setter.setViewAlpha(mAppsView.getContentView(), hasContent ? 1 : 0, allAppsFade);

        setter.setViewAlpha(mAppsView.getScrollBar(), hasContent ? 1 : 0, allAppsFade);

        mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasContent, setter,

                allAppsFade);



        setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA,

                (visibleElements & VERTICAL_SWIPE_INDICATOR) != 0 ? 255 : 0, LINEAR);

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

+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.launcher3.allapps;



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



import android.animation.ValueAnimator;

import android.content.Context;

import android.graphics.Point;
@@ -28,6 +26,7 @@ import android.util.AttributeSet; 
import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.animation.Interpolator;

import android.widget.LinearLayout;



import com.android.launcher3.R;
@@ -227,8 +226,9 @@ public class FloatingHeaderView extends LinearLayout implements 
        p.y = getTop() - mCurrentRV.getTop() - mParent.getTop();

    }



    public void setContentVisibility(boolean hasHeader, boolean hasContent, PropertySetter setter) {

        setter.setViewAlpha(this, hasContent ? 1 : 0, LINEAR);

    public void setContentVisibility(boolean hasHeader, boolean hasContent, PropertySetter setter,

            Interpolator fadeInterpolator) {

        setter.setViewAlpha(this, hasContent ? 1 : 0, fadeInterpolator);

        allowTouchForwarding(hasContent);

    }