From 7c7ece3efea20345de8c06708aedac82759c813c Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Tue, 23 Jan 2024 15:41:14 -0800 Subject: [PATCH] Rename isSplitSelectionEnabled() to isSplitSelectionActive() Bug: 295467097 Change-Id: I5c518c3e7227c034956fb92590b7472ba4a71d39 --- .../launcher3/taskbar/TaskbarLauncherStateController.java | 2 +- .../launcher3/uioverrides/QuickstepInteractionHandler.java | 2 +- .../com/android/launcher3/uioverrides/QuickstepLauncher.java | 2 +- src/com/android/launcher3/Launcher.java | 4 ++-- src/com/android/launcher3/touch/ItemLongClickListener.java | 2 +- src/com/android/launcher3/touch/WorkspaceTouchListener.java | 2 +- src/com/android/launcher3/views/ActivityContext.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index a8506805b8..8e4a78fc0b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -207,7 +207,7 @@ public class TaskbarLauncherStateController { applyState(); boolean disallowLongClick = FeatureFlags.enableSplitContextually() - ? mLauncher.isSplitSelectionEnabled() + ? mLauncher.isSplitSelectionActive() : finalState == LauncherState.OVERVIEW_SPLIT_SELECT; com.android.launcher3.taskbar.Utilities.setOverviewDragState( mControllers, finalState.disallowTaskbarGlobalDrag(), diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java index d834935036..22f24f185a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java @@ -59,7 +59,7 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler { return RemoteViews.startPendingIntent(hostView, pendingIntent, remoteResponse.getLaunchOptions(view)); } - if (mLauncher.isSplitSelectionEnabled()) { + if (mLauncher.isSplitSelectionActive()) { // Log metric StatsLogManager.StatsLogger logger = mLauncher.getStatsLogManager().logger(); logger.log(LAUNCHER_SPLIT_WIDGET_ATTEMPT); diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 2e8e613595..9b73bb10a3 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -725,7 +725,7 @@ public class QuickstepLauncher extends Launcher { } @Override - public boolean isSplitSelectionEnabled() { + public boolean isSplitSelectionActive() { return mSplitSelectStateController.isSplitSelectActive(); } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 39b8de161a..5b5d4cbbf3 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2760,7 +2760,7 @@ public class Launcher extends StatefulActivity } LauncherRootView rv = getRootView(); if (rv != null) { - boolean isSplitSelectionEnabled = isSplitSelectionEnabled(); + boolean isSplitSelectionEnabled = isSplitSelectionActive(); boolean disableBack = getStateManager().getState() == NORMAL && AbstractFloatingView.getTopOpenView(this) == null && !isSplitSelectionEnabled; @@ -2769,7 +2769,7 @@ public class Launcher extends StatefulActivity } /** To be overridden by subclasses */ - public boolean isSplitSelectionEnabled() { + public boolean isSplitSelectionActive() { // Overridden return false; } diff --git a/src/com/android/launcher3/touch/ItemLongClickListener.java b/src/com/android/launcher3/touch/ItemLongClickListener.java index 9e7d4dcb6e..116f13a89f 100644 --- a/src/com/android/launcher3/touch/ItemLongClickListener.java +++ b/src/com/android/launcher3/touch/ItemLongClickListener.java @@ -184,7 +184,7 @@ public class ItemLongClickListener { // Return early if an item is already being dragged (e.g. when long-pressing two shortcuts) if (launcher.getDragController().isDragging()) return false; // Return early if user is in the middle of selecting split-screen apps - if (FeatureFlags.enableSplitContextually() && launcher.isSplitSelectionEnabled()) { + if (FeatureFlags.enableSplitContextually() && launcher.isSplitSelectionActive()) { return false; } diff --git a/src/com/android/launcher3/touch/WorkspaceTouchListener.java b/src/com/android/launcher3/touch/WorkspaceTouchListener.java index 5b6c9e0763..8c43f75c08 100644 --- a/src/com/android/launcher3/touch/WorkspaceTouchListener.java +++ b/src/com/android/launcher3/touch/WorkspaceTouchListener.java @@ -206,7 +206,7 @@ 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.enableSplitContextually() && mLauncher.isSplitSelectionEnabled()) { + if (FeatureFlags.enableSplitContextually() && mLauncher.isSplitSelectionActive()) { mLauncher.dismissSplitSelection(); } } else { diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java index bef84f7bf3..0cddc97749 100644 --- a/src/com/android/launcher3/views/ActivityContext.java +++ b/src/com/android/launcher3/views/ActivityContext.java @@ -150,7 +150,7 @@ public interface ActivityContext { * @return {@code true} if user has selected the first split app and is in the process of * selecting the second */ - default boolean isSplitSelectionEnabled() { + default boolean isSplitSelectionActive() { // Overridden return false; }