Merge "Use aconfig flag enable_split_contextual" into main (0fcd2311) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ public class TaskbarLauncherStateController {
		}
		applyState();
		boolean disallowLongClick =
		FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()
		FeatureFlags.enableSplitContextually()
		? mLauncher.isSplitSelectionEnabled()
		: finalState == LauncherState.OVERVIEW_SPLIT_SELECT;
		com.android.launcher3.taskbar.Utilities.setOverviewDragState(

+1 −2

Original line number	Diff line number	Diff line
		@@ -107,8 +107,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
		setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,
		config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));

		boolean exitingOverview = !FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()
		&& !toState.overviewUi;
		boolean exitingOverview = !FeatureFlags.enableSplitContextually() && !toState.overviewUi;
		if (mRecentsView.isSplitSelectionActive() && exitingOverview) {
		setter.add(mRecentsView.getSplitSelectController().getSplitAnimationController()
		.createPlaceholderDismissAnim(mLauncher));

+2 −3

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
		import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
		import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_HOME_TRANSITION_LISTENER;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE;
		import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
		import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
		import static com.android.launcher3.popup.QuickstepSystemShortcut.getSplitSelectShortcutByPosition;
		@@ -644,7 +643,7 @@ public class QuickstepLauncher extends Launcher {
		splitSelectSource.alreadyRunningTaskId = taskWasFound
		? foundTask.key.id
		: INVALID_TASK_ID;
		if (ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()) {
		if (FeatureFlags.enableSplitContextually()) {
		startSplitToHome(splitSelectSource);
		} else {
		recentsView.initiateSplitSelect(splitSelectSource);
		@@ -718,7 +717,7 @@ public class QuickstepLauncher extends Launcher {

		super.onPause();

		if (ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()) {
		if (FeatureFlags.enableSplitContextually()) {
		// If Launcher pauses before both split apps are selected, exit split screen.
		if (!mSplitSelectStateController.isBothSplitAppsConfirmed() &&
		!mSplitSelectStateController.isLaunchingFirstAppFullscreen()) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ public class NavBarToHomeTouchController implements TouchController,
		() -> recentsView.finishRecentsAnimation(true /* toRecents */, null));
		if (mStartState.overviewUi) {
		new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(mEndState),
		FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()
		FeatureFlags.enableSplitContextually()
		? mCancelSplitRunnable
		: null)
		.animateWithVelocity(velocity);

+1 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
		setOverviewSelectEnabled(false);
		}
		if (finalState != OVERVIEW_SPLIT_SELECT) {
		if (FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()) {
		if (FeatureFlags.enableSplitContextually()) {
		mSplitSelectStateController.resetState();
		} else {
		resetFromSplitSelectionState();