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

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

Update interpolators and durations for state animations 

When we enter overview (overview appears, workspace disappears):
- Workspace scales down from 1f to .8f with OvershootInterpolator(1.2f) at 200 ms
- Workspace fades from 1f to 0 with OvershootInterpolator(1.2f) at 200 ms
- Overview scales down from 1.33f to 1f with OvershootInterpolator(1.2f) at 200 ms
- Overview fades from 0 to 1f with OvershootInterpolator(1.2f) at 200 ms

When we exit overview (overview disappears, workspace appears):
- Workspace scales up from .92f to .1f with DecelerateInterpolator() at 200 ms
- Workspace fades from 0 to 1f with AccelerateInterpolator() at 200 ms
- Overview scales up from 1f to 1.1f with AccelerateInterpolator() at 180ms
- Overview fades from 1f to 0 with DecelerateInterpolator(1.7f) at 200 ms

Parallax while the finger moves: Workspace translates half the distance as the shelf

Bug: 79776746
Change-Id: I319d982cf202bcd6dbbcd68ffc5c0c7853629c7e
parent 07b8b0b1

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

+4 −2
Original line number Diff line number Diff line
@@ -68,8 +68,10 @@ public class AllAppsState extends LauncherState { 


    @Override

    public float[] getWorkspaceScaleAndTranslation(Launcher launcher) {

        // TODO: interpolate

        return LauncherState.OVERVIEW.getWorkspaceScaleAndTranslation(launcher);

        float[] scaleAndTranslation = LauncherState.OVERVIEW.getWorkspaceScaleAndTranslation(

                launcher);

        scaleAndTranslation[0] = 1;

        return scaleAndTranslation;

    }



    @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class OverviewState extends LauncherState { 
                ? workspacePage.getWidth() : launcher.getDeviceProfile().availableWidthPx;

        recentsView.getTaskSize(sTempRect);

        float scale = (float) sTempRect.width() / workspacePageWidth;

        float parallaxFactor = 0.4f;

        float parallaxFactor = 0.5f;

        return new float[]{scale, 0, -getDefaultSwipeHeight(launcher) * parallaxFactor};

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
                    }

                };

                animator.setFloatValues(0, 1);

                animator.setDuration(Math.max(expectedDuration, 300)).setInterpolator(LINEAR);

                animator.setDuration(Math.min(expectedDuration, ATOMIC_DURATION))

                        .setInterpolator(LINEAR);

            }

        } else {

            mFinishFastOnSecondTouch = false;

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

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

package com.android.launcher3.uioverrides;



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

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

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

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

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

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

import static com.android.quickstep.QuickScrubController.QUICK_SCRUB_START_INTERPOLATOR;
@@ -72,16 +76,17 @@ public class RecentsViewStateController implements StateHandler { 
        }

        PropertySetter setter = config.getPropertySetter(builder);

        float[] scaleTranslationYFactor = toState.getOverviewScaleAndTranslationYFactor(mLauncher);

        setter.setFloat(mRecentsView, ADJACENT_SCALE, scaleTranslationYFactor[0], LINEAR);

        Interpolator transYInterpolator = LINEAR;

        if (toState == LauncherState.FAST_OVERVIEW) {

        Interpolator scaleInterpolator = builder.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR);

        setter.setFloat(mRecentsView, ADJACENT_SCALE, scaleTranslationYFactor[0], scaleInterpolator);

        Interpolator transYInterpolator = scaleInterpolator;

        if (mLauncher.getStateManager().getState() == OVERVIEW && toState == FAST_OVERVIEW) {

            transYInterpolator = Interpolators.clampToProgress(QUICK_SCRUB_START_INTERPOLATOR, 0,

                    QUICK_SCRUB_TRANSLATION_Y_FACTOR);

        }

        setter.setFloat(mRecentsView, TRANSLATION_Y_FACTOR, scaleTranslationYFactor[1],

                transYInterpolator);

        setter.setFloat(mRecentsViewContainer, CONTENT_ALPHA, toState.overviewUi ? 1 : 0,

                AGGRESSIVE_EASE_IN_OUT);

                builder.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));



        if (!toState.overviewUi) {

            builder.addOnFinishRunnable(mRecentsView::resetTaskVisuals);

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

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.launcher3.uioverrides;



import static android.view.View.VISIBLE;

import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;

import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;

import static com.android.launcher3.LauncherState.ALL_APPS;
@@ -201,6 +202,13 @@ public class UiFactory { 
        return true;

    }



    public static void prepareToShowOverview(Launcher launcher) {

        RecentsView overview = launcher.getOverviewPanel();

        if (overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) {

            overview.setAdjacentScale(1.33f);

        }

    }



    private static class LauncherTaskViewController extends TaskViewTouchController<Launcher> {



        public LauncherTaskViewController(Launcher activity) {