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

Commit ca1cda1e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Use correct interpolator for recents scale when quick scrubbing am: 4ff7d8e7 

Change-Id: Idc871494af4eb507e841e07d6d758a6a83336fbf
parents 7f72718c 4ff7d8e7

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

+7 −6
Original line number Diff line number Diff line
@@ -76,15 +76,16 @@ public class RecentsViewStateController implements StateHandler { 
        }

        PropertySetter setter = config.getPropertySetter(builder);

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

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

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

        Interpolator transYInterpolator = scaleInterpolator;

        Interpolator scaleAndTransYInterpolator = builder.getInterpolator(

                ANIM_OVERVIEW_SCALE, LINEAR);

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

            transYInterpolator = Interpolators.clampToProgress(QUICK_SCRUB_START_INTERPOLATOR, 0,

                    QUICK_SCRUB_TRANSLATION_Y_FACTOR);

            scaleAndTransYInterpolator = Interpolators.clampToProgress(

                    QUICK_SCRUB_START_INTERPOLATOR, 0, QUICK_SCRUB_TRANSLATION_Y_FACTOR);

        }

        setter.setFloat(mRecentsView, SCALE_PROPERTY, scaleTranslationYFactor[0],

                scaleAndTransYInterpolator);

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

                transYInterpolator);

                scaleAndTransYInterpolator);

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

                builder.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));