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

Commit b5ebb5d1 authored by Matt Sziklay's avatar Matt Sziklay Committed by Automerger Merge Worker
Browse files

Merge "Allow entering split screen on an app currently open in desktop mode."... 

Merge "Allow entering split screen on an app currently open in desktop mode." into udc-qpr-dev am: 98c1d220 am: 254445b0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24249099



Change-Id: I6d0e4e7a97bcb67c06acb9789fd45114f675752c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d275e4e9 254445b0

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenConstants.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.wm.shell.common.split;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
@@ -60,7 +61,8 @@ public class SplitScreenConstants { 
    public static final int[] CONTROLLED_WINDOWING_MODES =

            {WINDOWING_MODE_FULLSCREEN, WINDOWING_MODE_UNDEFINED};

    public static final int[] CONTROLLED_WINDOWING_MODES_WHEN_ACTIVE =

            {WINDOWING_MODE_FULLSCREEN, WINDOWING_MODE_UNDEFINED, WINDOWING_MODE_MULTI_WINDOW};

            {WINDOWING_MODE_FULLSCREEN, WINDOWING_MODE_UNDEFINED, WINDOWING_MODE_MULTI_WINDOW,

            WINDOWING_MODE_FREEFORM};



    /** Flag applied to a transition change to identify it as a divider bar for animation. */

    public static final int FLAG_IS_DIVIDER_BAR = FLAG_FIRST_CUSTOM;

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

+19 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.desktopmode 


import android.R

import android.app.ActivityManager.RunningTaskInfo

import android.app.WindowConfiguration

import android.app.WindowConfiguration.ACTIVITY_TYPE_HOME

import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD

import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM
@@ -301,6 +302,24 @@ class DesktopTasksController( 
        }

    }



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

    fun moveToSplit(task: RunningTaskInfo) {

        KtProtoLog.v(

            WM_SHELL_DESKTOP_MODE,

            "DesktopTasksController: moveToSplit taskId=%d",

            task.taskId

        )

        val wct = WindowContainerTransaction()

        wct.setWindowingMode(task.token, WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW)

        wct.setBounds(task.token, null)

        wct.setDensityDpi(task.token, getDefaultDensityDpi())

        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

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

        } else {

            shellTaskOrganizer.applyTransaction(wct)

        }

    }



    /**

     * The second part of the animated move to desktop transition, called after

     * {@link startMoveToDesktop}. Move a task to fullscreen after being dragged from fullscreen

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

+14 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import com.android.wm.shell.desktopmode.DesktopModeController; 
import com.android.wm.shell.desktopmode.DesktopModeStatus;

import com.android.wm.shell.desktopmode.DesktopTasksController;

import com.android.wm.shell.freeform.FreeformTaskTransitionStarter;

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

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

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

import com.android.wm.shell.sysui.ShellController;
@@ -200,6 +201,19 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
    @Override

    public void setSplitScreenController(SplitScreenController splitScreenController) {

        mSplitScreenController = splitScreenController;

        mSplitScreenController.registerSplitScreenListener(new SplitScreen.SplitScreenListener() {

            @Override

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

                if (visible) {

                    DesktopModeWindowDecoration decor = mWindowDecorByTaskId.get(taskId);

                    if (decor != null && DesktopModeStatus.isActive(mContext)

                            && decor.mTaskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) {

                        mDesktopModeController.ifPresent(c -> c.setDesktopModeActive(false));

                        mDesktopTasksController.ifPresent(c -> c.moveToSplit(decor.mTaskInfo));

                    }

                }

            }

        });

    }



    @Override