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

Commit 22bb04bb authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Automerger Merge Worker
Browse files

Merge "Additional polish for the NORMAL<->ALL_APPS transitions." into tm-dev am: 175fc66a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18375247



Change-Id: I013d007551ffe928902a9e49ac8bee3f65b88306
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52a24c8c 175fc66a

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

+8 −3
Original line number Diff line number Diff line
@@ -80,13 +80,18 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 


    // Custom timing for NORMAL -> ALL_APPS on phones only.

    private static final float ALL_APPS_STATE_TRANSITION = 0.4f;

    private static final float ALL_APPS_FULL_DEPTH_PROGRESS = 0.5f;



    // Custom interpolators for NORMAL -> ALL_APPS on phones only.

    private static final Interpolator LINEAR_EARLY =

            Interpolators.clampToProgress(LINEAR, 0f, ALL_APPS_STATE_TRANSITION);

    private static final Interpolator STEP_TRANSITION =

            Interpolators.clampToProgress(FINAL_FRAME, 0f, ALL_APPS_STATE_TRANSITION);

    public static final Interpolator BLUR = LINEAR_EARLY;

    // The blur to and from All Apps is set to be complete when the interpolator is at 0.5.

    public static final Interpolator BLUR =

            Interpolators.clampToProgress(

                    Interpolators.mapToProgress(LINEAR, 0f, ALL_APPS_FULL_DEPTH_PROGRESS),

                    0f, ALL_APPS_STATE_TRANSITION);

    public static final Interpolator WORKSPACE_FADE = STEP_TRANSITION;

    public static final Interpolator WORKSPACE_SCALE = LINEAR_EARLY;

    public static final Interpolator HOTSEAT_FADE = STEP_TRANSITION;
@@ -97,8 +102,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
            Interpolators.clampToProgress(LINEAR, ALL_APPS_STATE_TRANSITION, 1f);

    public static final Interpolator ALL_APPS_VERTICAL_PROGRESS =

            Interpolators.clampToProgress(

                    Interpolators.mapToProgress(LINEAR, ALL_APPS_STATE_TRANSITION, 1.0f),

                    ALL_APPS_STATE_TRANSITION, 1.0f);

                    Interpolators.mapToProgress(LINEAR, ALL_APPS_STATE_TRANSITION, 1f),

                    ALL_APPS_STATE_TRANSITION, 1f);



    private final PortraitOverviewStateTouchHelper mOverviewPortraitStateTouchHelper;

src/com/android/launcher3/touch/AllAppsSwipeController.java

+10 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCA 
import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;

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

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

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

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



import android.view.MotionEvent;
@@ -52,6 +53,7 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { 
    private static final float WORKSPACE_MOTION_START = 0.1667f;

    private static final float ALL_APPS_STATE_TRANSITION = 0.305f;

    private static final float ALL_APPS_FADE_END = 0.4717f;

    private static final float ALL_APPS_FULL_DEPTH_PROGRESS = 0.5f;



    public static final Interpolator ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER =

            Interpolators.clampToProgress(LINEAR, 0, ALLAPPS_STAGGERED_FADE_THRESHOLD);
@@ -59,14 +61,18 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { 
            Interpolators.clampToProgress(LINEAR, ALLAPPS_STAGGERED_FADE_THRESHOLD, 1f);



    // Custom interpolators for NORMAL -> ALL_APPS on phones only.

    // The blur to All Apps is set to be complete when the interpolator is at 0.5.

    public static final Interpolator BLUR =

            Interpolators.clampToProgress(

                    EMPHASIZED_DECELERATE, WORKSPACE_MOTION_START, ALL_APPS_STATE_TRANSITION);

                    Interpolators.mapToProgress(

                            EMPHASIZED_DECELERATE, 0f, ALL_APPS_FULL_DEPTH_PROGRESS),

                    WORKSPACE_MOTION_START, ALL_APPS_STATE_TRANSITION);

    public static final Interpolator WORKSPACE_FADE =

            Interpolators.clampToProgress(FINAL_FRAME, 0f, ALL_APPS_STATE_TRANSITION);

    public static final Interpolator WORKSPACE_SCALE =

            Interpolators.clampToProgress(

                    EMPHASIZED_DECELERATE, WORKSPACE_MOTION_START, ALL_APPS_STATE_TRANSITION);

    public static final Interpolator HOTSEAT_FADE =

            Interpolators.clampToProgress(FINAL_FRAME, 0f, ALL_APPS_STATE_TRANSITION);

    public static final Interpolator HOTSEAT_FADE = WORKSPACE_FADE;

    public static final Interpolator HOTSEAT_SCALE = HOTSEAT_FADE;

    public static final Interpolator HOTSEAT_TRANSLATE =

            Interpolators.clampToProgress(
@@ -163,6 +169,7 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { 
            config.setInterpolator(ANIM_ALL_APPS_FADE, INSTANT);

        } else {

            config.setInterpolator(ANIM_DEPTH, BLUR);

            config.setInterpolator(ANIM_WORKSPACE_FADE, WORKSPACE_FADE);

            config.setInterpolator(ANIM_WORKSPACE_SCALE, WORKSPACE_SCALE);

            config.setInterpolator(ANIM_HOTSEAT_FADE, HOTSEAT_FADE);

            config.setInterpolator(ANIM_HOTSEAT_SCALE, HOTSEAT_SCALE);