diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index fe797a31a0..a71333a3bc 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -987,6 +987,13 @@ public class QuickstepLauncher extends Launcher { .playPlaceholderDismissAnim(this); } + @Override + public void dismissSplitSelection() { + super.dismissSplitSelection(); + mSplitSelectStateController.getSplitAnimationController() + .playPlaceholderDismissAnim(this); + } + public T getActionsView() { return (T) mActionsView; } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 01e86aa5c4..5936d78299 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3116,6 +3116,11 @@ public class Launcher extends StatefulActivity return false; } + /** Call to dismiss the intermediary split selection state. */ + public void dismissSplitSelection() { + // Overridden; move this into ActivityContext if necessary for Taskbar + } + @Override public void returnToHomescreen() { super.returnToHomescreen(); diff --git a/src/com/android/launcher3/touch/WorkspaceTouchListener.java b/src/com/android/launcher3/touch/WorkspaceTouchListener.java index 96ae4a32fd..1232069f59 100644 --- a/src/com/android/launcher3/touch/WorkspaceTouchListener.java +++ b/src/com/android/launcher3/touch/WorkspaceTouchListener.java @@ -40,6 +40,7 @@ import com.android.launcher3.CellLayout; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.Workspace; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.testing.TestLogging; @@ -205,6 +206,10 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); mLauncher.getStatsLogManager().logger().log(LAUNCHER_WORKSPACE_LONGPRESS); mLauncher.showDefaultOptions(mTouchDownPoint.x, mTouchDownPoint.y); + if (FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get() && + mLauncher.isSplitSelectionEnabled()) { + mLauncher.dismissSplitSelection(); + } } else { cancelLongPress(); }