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

Commit c505fc58 authored by Matt Sziklay's avatar Matt Sziklay Committed by Android (Google) Code Review
Browse files

Merge "Remove moveToSplit" into main

parents ffcc231e e18322e5

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+0 −13
Original line number Original line Diff line number Diff line
@@ -554,19 +554,6 @@ class DesktopTasksController( 
        }

        }

    }

    }





    /** Move a desktop app to split screen. */

    fun moveToSplit(task: RunningTaskInfo) {

        logV( "moveToSplit taskId=%s", task.taskId)

        desktopTilingDecorViewModel.removeTaskIfTiled(task.displayId, task.taskId)

        val wct = WindowContainerTransaction()

        wct.setBounds(task.token, Rect())

        // Rather than set windowing mode to multi-window at task level, set it to

        // undefined and inherit from split stage.

        wct.setWindowingMode(task.token, WINDOWING_MODE_UNDEFINED)



        transitions.startTransition(TRANSIT_CHANGE, wct, null /* handler */)

    }



    private fun exitSplitIfApplicable(wct: WindowContainerTransaction, taskInfo: RunningTaskInfo) {

    private fun exitSplitIfApplicable(wct: WindowContainerTransaction, taskInfo: RunningTaskInfo) {

        if (splitScreenController.isTaskInSplitScreen(taskInfo.taskId)) {

        if (splitScreenController.isTaskInSplitScreen(taskInfo.taskId)) {

            splitScreenController.prepareExitSplitScreen(

            splitScreenController.prepareExitSplitScreen(

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+0 −14
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ import static com.android.wm.shell.shared.desktopmode.ManageWindowsViewContainer 
import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;

import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;

import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT;

import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT;

import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED;

import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED;

import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED;





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.app.ActivityManager;

import android.app.ActivityManager;
@@ -122,8 +121,6 @@ import com.android.wm.shell.shared.annotations.ShellMainThread; 
import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource;

import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource;

import com.android.wm.shell.shared.split.SplitScreenConstants.SplitPosition;

import com.android.wm.shell.shared.split.SplitScreenConstants.SplitPosition;

import com.android.wm.shell.splitscreen.SplitScreen;

import com.android.wm.shell.splitscreen.SplitScreen.StageType;

import com.android.wm.shell.splitscreen.SplitScreenController;

import com.android.wm.shell.splitscreen.SplitScreenController;

import com.android.wm.shell.sysui.KeyguardChangeListener;

import com.android.wm.shell.sysui.KeyguardChangeListener;

import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellCommandHandler;
@@ -446,17 +443,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, 
    @Override

    @Override

    public void setSplitScreenController(SplitScreenController splitScreenController) {

    public void setSplitScreenController(SplitScreenController splitScreenController) {

        mSplitScreenController = splitScreenController;

        mSplitScreenController = splitScreenController;

        mSplitScreenController.registerSplitScreenListener(new SplitScreen.SplitScreenListener() {

            @Override

            public void onTaskStageChanged(int taskId, @StageType int stage, boolean visible) {

                if (visible && stage != STAGE_TYPE_UNDEFINED) {

                    DesktopModeWindowDecoration decor = mWindowDecorByTaskId.get(taskId);

                    if (decor != null && DesktopModeStatus.canEnterDesktopMode(mContext)) {

                        mDesktopTasksController.moveToSplit(decor.mTaskInfo);

                    }

                }

            }

        });

    }

    }





    @Override

    @Override