diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java index e508690113..2eb19ec146 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java @@ -105,7 +105,7 @@ public abstract class BaseRecentsViewStateController TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION, mLauncher.getDeviceProfile()); setter.setFloat(mRecentsView, taskViewsFloat, - toState.getOverviewSecondaryTranslation(mLauncher), LINEAR); + toState.getSplitSelectTranslation(mLauncher), LINEAR); setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0, config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT)); diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java index 722d74a55a..6968494b0f 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java @@ -41,11 +41,14 @@ public class SplitScreenSelectState extends OverviewState { } @Override - public float getOverviewSecondaryTranslation(Launcher launcher) { + public float getSplitSelectTranslation(Launcher launcher) { RecentsView recentsView = launcher.getOverviewPanel(); - PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); int splitPosition = recentsView.getSplitPlaceholder().getSplitController() .getActiveSplitPositionOption().mStagePosition; + if (!recentsView.shouldShiftThumbnailsForSplitSelect(splitPosition)) { + return 0f; + } + PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); int direction = orientationHandler.getSplitTranslationDirectionFactor(splitPosition); return launcher.getResources().getDimension(R.dimen.split_placeholder_size) * direction; } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index dfe0c4347a..7d19f6cd9b 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -127,6 +127,7 @@ import com.android.launcher3.util.DynamicResource; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.MultiValueAlpha; import com.android.launcher3.util.ResourceBasedOverride.Overrides; +import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.Themes; import com.android.launcher3.util.TranslateEdgeEffect; @@ -2417,6 +2418,47 @@ public abstract class RecentsView