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

Commit b1646165 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9128530 from 1aa91f0f to tm-qpr1-release 

Change-Id: I74548488629e635596ab28dabc21dc7da65fcaab
parents b33e0d81 1aa91f0f

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

+2 −1
Original line number Diff line number Diff line
@@ -130,10 +130,11 @@ public final class RecentsViewStateController extends 


        mRecentsView.createSplitSelectInitAnimation(builder,

                toState.getTransitionDuration(mLauncher, true /* isToState */));

        // Add properties to shift remaining taskViews to get out of placeholder view

        // Shift tasks vertically downward to get out of placeholder view

        builder.setFloat(mRecentsView, taskViewsFloat.first,

                toState.getSplitSelectTranslation(mLauncher),

                timings.getGridSlidePrimaryInterpolator());

        // Zero out horizontal translation

        builder.setFloat(mRecentsView, taskViewsFloat.second,

                0,

                timings.getGridSlideSecondaryInterpolator());

quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.quickstep.util;



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

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



import android.view.animation.Interpolator;



/**
@@ -44,14 +47,14 @@ abstract class OverviewToSplitTimings implements SplitAnimationTimings { 
    public int getInstructionsTextFadeInEnd() { return 300; }

    public int getInstructionsUnfoldStart() { return 167; }

    public int getInstructionsUnfoldEnd() { return 500; }

    public Interpolator getGridSlidePrimaryInterpolator() { return EMPHASIZED; }

    public Interpolator getGridSlideSecondaryInterpolator() { return INSTANT; }



    abstract public int getDuration();

    abstract public Interpolator getStagedRectXInterpolator();

    abstract public Interpolator getStagedRectYInterpolator();

    abstract public Interpolator getStagedRectScaleXInterpolator();

    abstract public Interpolator getStagedRectScaleYInterpolator();

    abstract public Interpolator getGridSlidePrimaryInterpolator();

    abstract public Interpolator getGridSlideSecondaryInterpolator();



    public float getGridSlideStartOffset() {

        return (float) getGridSlideStart() / getDuration();

quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.quickstep.util;



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

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



import android.view.animation.Interpolator;
@@ -41,6 +40,4 @@ public class PhoneOverviewToSplitTimings 
    public Interpolator getStagedRectYInterpolator() { return EMPHASIZED; }

    public Interpolator getStagedRectScaleXInterpolator() { return EMPHASIZED; }

    public Interpolator getStagedRectScaleYInterpolator() { return EMPHASIZED; }

    public Interpolator getGridSlidePrimaryInterpolator() { return EMPHASIZED; }

    public Interpolator getGridSlideSecondaryInterpolator() { return INSTANT; }

}

quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.quickstep.util;



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

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



import android.view.animation.Interpolator;
@@ -41,6 +40,4 @@ public class TabletOverviewToSplitTimings 
    public Interpolator getStagedRectYInterpolator() { return DEACCEL_2; }

    public Interpolator getStagedRectScaleXInterpolator() { return DEACCEL_2; }

    public Interpolator getStagedRectScaleYInterpolator() { return DEACCEL_2; }

    public Interpolator getGridSlidePrimaryInterpolator() { return LINEAR; }

    public Interpolator getGridSlideSecondaryInterpolator() { return LINEAR; }

}

quickstep/src/com/android/quickstep/views/RecentsView.java

+7 −0
Original line number Diff line number Diff line
@@ -3115,6 +3115,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                                            + splitTimings.getGridSlideDurationOffset(), 0f, 1f)

                            : 1f;



                    // Slide tiles in horizontally to fill dismissed area

                    anim.setFloat(child, translationProperty, scrollDiff,

                            clampToProgress(

                                    splitTimings.getGridSlidePrimaryInterpolator(),
@@ -4286,6 +4287,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            snapToPageImmediately(pageToSnapTo);

        }

        onLayout(false /*  changed */, getLeft(), getTop(), getRight(), getBottom());



        // We are leaving split selection state, so it is safe to reset thumbnail translations for

        // the next time split is invoked.

        setTaskViewsPrimarySplitTranslation(0);

        setTaskViewsSecondarySplitTranslation(0);



        resetTaskVisuals();

        mSplitHiddenTaskViewIndex = -1;

    }