diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java index 59ed8b385d..3fe2e59471 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java @@ -139,10 +139,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()); diff --git a/quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java b/quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java index d46c0f80a0..e189a66ee4 100644 --- a/quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java +++ b/quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java @@ -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(); diff --git a/quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java b/quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java index 66c41d6ab1..f1dde53d12 100644 --- a/quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java +++ b/quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java @@ -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; } } diff --git a/quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java b/quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java index 30defa7cf2..cbf46bfcb8 100644 --- a/quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java +++ b/quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java @@ -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; } } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index d2a42d0a86..771e91dbf6 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -3122,6 +3122,7 @@ public abstract class RecentsView