From 1525cd72696e2a2fa7d5b7754b8ebd88cfd5a72e Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Fri, 6 Oct 2023 14:40:49 -0700 Subject: [PATCH] Add method to determine if launcher is in split selection state * Available for both launcher and taskbar via ActivityContext Bug: 295981634 Change-Id: I8767deea0b2432da3047209037874c966b83c3b3 --- .../android/launcher3/uioverrides/QuickstepLauncher.java | 2 +- src/com/android/launcher3/Launcher.java | 2 +- src/com/android/launcher3/views/ActivityContext.java | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 1b22c84fe3..0497890154 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -691,7 +691,7 @@ public class QuickstepLauncher extends Launcher { } @Override - protected boolean isSplitSelectionEnabled() { + public boolean isSplitSelectionEnabled() { return mSplitSelectStateController.isSplitSelectActive(); } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2b433f152c..b34a527cde 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3103,7 +3103,7 @@ public class Launcher extends StatefulActivity } /** To be overridden by subclasses */ - protected boolean isSplitSelectionEnabled() { + public boolean isSplitSelectionEnabled() { // Overridden return false; } diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java index 04f2ffa07c..0d55f159a6 100644 --- a/src/com/android/launcher3/views/ActivityContext.java +++ b/src/com/android/launcher3/views/ActivityContext.java @@ -145,6 +145,15 @@ public interface ActivityContext { // Overridden, intentionally empty } + /** + * @return {@code true} if user has selected the first split app and is in the process of + * selecting the second + */ + default boolean isSplitSelectionEnabled() { + // Overridden + return false; + } + /** * The root view to support drag-and-drop and popup support. */