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

Commit 05ca003b authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Do not enter stage split from keyboard shortcuts if the user is already in split" into main

parents 766b80bb be498432

quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java

+4 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.quickstep.RecentsAnimationDeviceState; 
import com.android.quickstep.RecentsAnimationTargets;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.TopTaskTracker;

import com.android.quickstep.views.FloatingTaskView;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.shared.recents.model.Task;
@@ -75,7 +76,9 @@ public class SplitWithKeyboardShortcutController { 


    @BinderThread

    public void enterStageSplit(boolean leftOrTop) {

        if (!enableSplitContextually()) {

        if (!enableSplitContextually() ||

                // Do not enter stage split from keyboard shortcuts if the user is already in split

                TopTaskTracker.INSTANCE.get(mLauncher).getRunningSplitTaskIds().length == 2) {

            return;

        }

        RecentsAnimationCallbacks callbacks = new RecentsAnimationCallbacks(