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

Commit e75b1c8a authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Android (Google) Code Review
Browse files

Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev

parents 7ba0339b ef006c76

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

+10 −6
Original line number Diff line number Diff line
@@ -58,17 +58,21 @@ public class AllAppsState extends LauncherState { 


    @Override

    public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {

        ScaleAndTranslation scaleAndTranslation =

                new ScaleAndTranslation(NO_SCALE, NO_OFFSET, NO_OFFSET);

        return new ScaleAndTranslation(0.97f, NO_OFFSET, NO_OFFSET);

    }



    @Override

    public ScaleAndTranslation getHotseatScaleAndTranslation(Launcher launcher) {

        if (launcher.getDeviceProfile().isTablet) {

            scaleAndTranslation.scale = 0.97f;

            return getWorkspaceScaleAndTranslation(launcher);

        } else {

            ScaleAndTranslation overviewScaleAndTranslation = LauncherState.OVERVIEW

                    .getWorkspaceScaleAndTranslation(launcher);

            scaleAndTranslation.translationX = overviewScaleAndTranslation.translationX;

            scaleAndTranslation.translationY = overviewScaleAndTranslation.translationY;

            return new ScaleAndTranslation(

                    NO_SCALE,

                    overviewScaleAndTranslation.translationX,

                    overviewScaleAndTranslation.translationY);

        }

        return scaleAndTranslation;

    }



    @Override

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

+4 −1
Original line number Diff line number Diff line
@@ -192,7 +192,10 @@ public class QuickstepAtomicAnimationFactory extends 
                    1 - ALL_APPS_SCRIM_VISIBLE_THRESHOLD));

            config.setInterpolator(ANIM_VERTICAL_PROGRESS, EMPHASIZED_ACCELERATE);

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

            if (mActivity.getDeviceProfile().isTablet) {

                config.setInterpolator(ANIM_VERTICAL_PROGRESS, EMPHASIZED_DECELERATE);

            }

            // TODO(b/231682175): centralize this setup in AllAppsSwipeController

        }

    }

}

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
    <dimen name="fastscroll_end_margin">-26dp</dimen>



    <!-- All Apps -->

    <dimen name="all_apps_starting_vertical_translate">320dp</dimen>

    <dimen name="all_apps_starting_vertical_translate">300dp</dimen>

    <dimen name="all_apps_search_bar_field_height">48dp</dimen>

    <!-- all_apps_search_bar_field_height / 2 -->

    <dimen name="all_apps_search_bar_content_overlap">24dp</dimen>

src/com/android/launcher3/WorkspaceStateTransitionAnimation.java

+8 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import static com.android.launcher3.anim.Interpolators.ZOOM_OUT; 
import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;

import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;

import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;

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

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

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

import static com.android.launcher3.states.StateAnimationConfig.ANIM_SCRIM_FADE;
@@ -117,8 +118,6 @@ public class WorkspaceStateTransitionAnimation { 
        }



        int elements = state.getVisibleElements(mLauncher);

        Interpolator fadeInterpolator = config.getInterpolator(ANIM_WORKSPACE_FADE,

                pageAlphaProvider.interpolator);

        Hotseat hotseat = mWorkspace.getHotseat();

        Interpolator scaleInterpolator = config.getInterpolator(ANIM_WORKSPACE_SCALE, ZOOM_OUT);

        LauncherState fromState = mLauncher.getStateManager().getState();
@@ -146,11 +145,15 @@ public class WorkspaceStateTransitionAnimation { 
                    hotseatScaleInterpolator);

        }



        float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;

        propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, fadeInterpolator);

        Interpolator workspaceFadeInterpolator = config.getInterpolator(ANIM_WORKSPACE_FADE,

                pageAlphaProvider.interpolator);

        float workspacePageIndicatorAlpha = (elements & WORKSPACE_PAGE_INDICATOR) != 0 ? 1 : 0;

        propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),

                workspacePageIndicatorAlpha, fadeInterpolator);

                workspacePageIndicatorAlpha, workspaceFadeInterpolator);

        Interpolator hotseatFadeInterpolator = config.getInterpolator(ANIM_HOTSEAT_FADE,

                workspaceFadeInterpolator);

        float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;

        propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, hotseatFadeInterpolator);



        // Update the accessibility flags for hotseat based on launcher state.

        hotseat.setImportantForAccessibility(

src/com/android/launcher3/anim/Interpolators.java

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ public class Interpolators { 
    public static final Interpolator DECELERATED_EASE = new PathInterpolator(0, 0, .2f, 1f);

    public static final Interpolator ACCELERATED_EASE = new PathInterpolator(0.4f, 0, 1f, 1f);



    public static final Interpolator EMPHASIZED_ACCELERATE = new PathInterpolator(

            0.3f, 0f, 0.8f, 0.15f);

    public static final Interpolator EMPHASIZED_DECELERATE = new PathInterpolator(

            0.05f, 0.7f, 0.1f, 1f);



    public static final Interpolator EXAGGERATED_EASE;



    public static final Interpolator INSTANT = t -> 1;