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

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

Update all apps fade interpolators for home <-> all app 

Previously, predictions faded in quickly but then all apps faded in
linerally over entire rest of the transition. Now, all apps fades in
quickly after reaching the overview threshold where predictions are
opaque.

Also implemented the reverse, so that predictions/all apps content
remain opaque when returning home until reaching the overview threshold
near the bottom, where they fade out as quickly as they faded in.

We do this for 3-button mode as well.

Bug: 141986013
Change-Id: Ia35ab3ac9714e89f754293445a7839e15da5313d
parent d39f7b51

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

+23 −5
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE; 
import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;

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

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

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

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

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

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

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -132,16 +132,33 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
            // Fade in prediction icons quickly, then rest of all apps after reaching overview.

            float progressToReachOverview = NORMAL.getVerticalProgress(mLauncher)

                    - OVERVIEW.getVerticalProgress(mLauncher);

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

                    0, ALL_APPS_CONTENT_FADE_THRESHOLD));

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

                    progressToReachOverview, 1));

            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(

                    ACCEL,

                    0,

                    ALL_APPS_CONTENT_FADE_THRESHOLD));

            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(

                    ACCEL,

                    progressToReachOverview,

                    progressToReachOverview + ALL_APPS_CONTENT_FADE_THRESHOLD));



            // Get workspace out of the way quickly, to prepare for potential pause.

            builder.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL_3);

            builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, DEACCEL_3);

            builder.setInterpolator(ANIM_WORKSPACE_FADE, DEACCEL_3);

            return builder;

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

            AnimatorSetBuilder builder = new AnimatorSetBuilder();

            // Keep all apps/predictions opaque until the very end of the transition.

            float progressToReachOverview = OVERVIEW.getVerticalProgress(mLauncher);

            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(

                    DEACCEL,

                    progressToReachOverview - ALL_APPS_CONTENT_FADE_THRESHOLD,

                    progressToReachOverview));

            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(

                    DEACCEL,

                    1 - ALL_APPS_CONTENT_FADE_THRESHOLD,

                    1));

            return builder;

        }

        return super.getAnimatorSetBuilderForStates(fromState, toState);

    }
@@ -164,6 +181,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 


            AnimatorSetBuilder builder = new AnimatorSetBuilder();

            builder.setInterpolator(ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_3);

            if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {

                builder.setInterpolator(ANIM_HOTSEAT_SCALE, OVERSHOOT_1_2);

                builder.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);

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

+18 −0
Original line number Diff line number Diff line
@@ -177,6 +177,20 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
        return builder;

    }



    private AnimatorSetBuilder getNormalToAllAppsAnimation() {

        AnimatorSetBuilder builder = new AnimatorSetBuilder();

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

                0, ALL_APPS_CONTENT_FADE_THRESHOLD));

        return builder;

    }



    private AnimatorSetBuilder getAllAppsToNormalAnimation() {

        AnimatorSetBuilder builder = new AnimatorSetBuilder();

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

                1 - ALL_APPS_CONTENT_FADE_THRESHOLD, 1));

        return builder;

    }



    @Override

    protected AnimatorSetBuilder getAnimatorSetBuilderForStates(LauncherState fromState,

            LauncherState toState) {
@@ -187,6 +201,10 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
            builder = getOverviewToAllAppsAnimation();

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

            builder = getAllAppsToOverviewAnimation();

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

            builder = getNormalToAllAppsAnimation();

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

            builder = getAllAppsToNormalAnimation();

        }

        return builder;

    }