Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c7ece3e authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Rename isSplitSelectionEnabled() to isSplitSelectionActive() 

Bug: 295467097
Change-Id: I5c518c3e7227c034956fb92590b7472ba4a71d39
parent 5a1c8862

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

+1 −1
Original line number Diff line number Diff line
@@ -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(),

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ public class QuickstepLauncher extends Launcher { 
    }



    @Override

    public boolean isSplitSelectionEnabled() {

    public boolean isSplitSelectionActive() {

        return mSplitSelectStateController.isSplitSelectActive();

    }

src/com/android/launcher3/Launcher.java

+2 −2
Original line number Diff line number Diff line
@@ -2760,7 +2760,7 @@ public class Launcher extends StatefulActivity<LauncherState> 
        }

        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<LauncherState> 
    }



    /** To be overridden by subclasses */

    public boolean isSplitSelectionEnabled() {

    public boolean isSplitSelectionActive() {

        // Overridden

        return false;

    }

src/com/android/launcher3/touch/ItemLongClickListener.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }