Merge "Dismiss split selection for workspace long-press" into main (b95ee09a) · Commits · e / os / android_packages_apps_Trebuchet

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -987,6 +987,13 @@ public class QuickstepLauncher extends Launcher {
		.playPlaceholderDismissAnim(this);
		}

		@Override
		public void dismissSplitSelection() {
		super.dismissSplitSelection();
		mSplitSelectStateController.getSplitAnimationController()
		.playPlaceholderDismissAnim(this);
		}

		public <T extends OverviewActionsView> T getActionsView() {
		return (T) mActionsView;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -3116,6 +3116,11 @@ public class Launcher extends StatefulActivity<LauncherState>
		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();

+5 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}