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

Commit 7c34183c authored by Ats Jenk's avatar Ats Jenk
Browse files

Turn off launch adjacent behavior when on desktop 

When user is on the desktop, and a new window of an app is created using
launch adjacent, it should open as another window. And not in split
screen.
Use LaunchAdjacentController to coordinate between desktop and split
screen. When on desktop, desktop controller disables launch adjacent.
When not on desktop, launch adjacent is enabled.
Split controller registers its container with the launch adjacent
controller so it can be restored as needed.

Test: atest DesktopTasksController
Test: open chrome in fullscreen, from menu choose new window, observe
  that the window opens in split screen
Test: open chrome in freeform, from menu choose new window, observe that
  a new freeform window is created

Bug: 279585872
Change-Id: If5199a8e5b59b313828061a3164f9880e033a9b3
parent 8172643b

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java

+4 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.wm.shell.ShellTaskOrganizer; 
import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayImeController;

import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.LaunchAdjacentController;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.common.SystemWindows;
@@ -86,13 +87,14 @@ public class TvWMShellModule { 
            TransactionPool transactionPool,

            IconProvider iconProvider,

            Optional<RecentTasksController> recentTasks,

            LaunchAdjacentController launchAdjacentController,

            @ShellMainThread ShellExecutor mainExecutor,

            Handler mainHandler,

            SystemWindows systemWindows) {

        return new TvSplitScreenController(context, shellInit, shellCommandHandler, shellController,

                shellTaskOrganizer, syncQueue, rootTDAOrganizer, displayController,

                displayImeController, displayInsetsController, dragAndDropController, transitions,

                transactionPool, iconProvider, recentTasks, mainExecutor, mainHandler,

                systemWindows);

                transactionPool, iconProvider, recentTasks, launchAdjacentController, mainExecutor,

                mainHandler, systemWindows);

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+10 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.wm.shell.common.DisplayInsetsController; 
import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.DockStateReader;

import com.android.wm.shell.common.FloatingContentCoordinator;

import com.android.wm.shell.common.LaunchAdjacentController;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.common.SystemWindows;
@@ -70,6 +71,8 @@ import com.android.wm.shell.draganddrop.DragAndDropController; 
import com.android.wm.shell.freeform.FreeformComponents;

import com.android.wm.shell.fullscreen.FullscreenTaskListener;

import com.android.wm.shell.hidedisplaycutout.HideDisplayCutoutController;

import com.android.wm.shell.keyguard.KeyguardTransitionHandler;

import com.android.wm.shell.keyguard.KeyguardTransitions;

import com.android.wm.shell.onehanded.OneHanded;

import com.android.wm.shell.onehanded.OneHandedController;

import com.android.wm.shell.pip.Pip;
@@ -77,8 +80,6 @@ import com.android.wm.shell.pip.PipMediaController; 
import com.android.wm.shell.pip.PipSurfaceTransactionHelper;

import com.android.wm.shell.pip.PipUiEventLogger;

import com.android.wm.shell.pip.phone.PipTouchHandler;

import com.android.wm.shell.keyguard.KeyguardTransitionHandler;

import com.android.wm.shell.keyguard.KeyguardTransitions;

import com.android.wm.shell.recents.RecentTasks;

import com.android.wm.shell.recents.RecentTasksController;

import com.android.wm.shell.recents.RecentsTransitionHandler;
@@ -275,6 +276,13 @@ public abstract class WMShellBaseModule { 
        return new WindowManagerShellWrapper(mainExecutor);

    }



    @WMSingleton

    @Provides

    static LaunchAdjacentController provideLaunchAdjacentController(

            SyncTransactionQueue syncQueue) {

        return new LaunchAdjacentController(syncQueue);

    }



    //

    // Back animation

    //

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+5 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.wm.shell.common.DisplayImeController; 
import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.FloatingContentCoordinator;

import com.android.wm.shell.common.LaunchAdjacentController;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.common.SystemWindows;
@@ -334,11 +335,12 @@ public abstract class WMShellModule { 
            TransactionPool transactionPool,

            IconProvider iconProvider,

            Optional<RecentTasksController> recentTasks,

            LaunchAdjacentController launchAdjacentController,

            @ShellMainThread ShellExecutor mainExecutor) {

        return new SplitScreenController(context, shellInit, shellCommandHandler, shellController,

                shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, displayController,

                displayImeController, displayInsetsController, dragAndDropController, transitions,

                transactionPool, iconProvider, recentTasks, mainExecutor);

                transactionPool, iconProvider, recentTasks, launchAdjacentController, mainExecutor);

    }



    //
@@ -689,12 +691,13 @@ public abstract class WMShellModule { 
            EnterDesktopTaskTransitionHandler enterDesktopTransitionHandler,

            ExitDesktopTaskTransitionHandler exitDesktopTransitionHandler,

            @DynamicOverride DesktopModeTaskRepository desktopModeTaskRepository,

            LaunchAdjacentController launchAdjacentController,

            @ShellMainThread ShellExecutor mainExecutor

    ) {

        return new DesktopTasksController(context, shellInit, shellCommandHandler, shellController,

                displayController, shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer,

                transitions, enterDesktopTransitionHandler, exitDesktopTransitionHandler,

                desktopModeTaskRepository, mainExecutor);

                desktopModeTaskRepository, launchAdjacentController, mainExecutor);

    }



    @WMSingleton

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

+8 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.wm.shell.ShellTaskOrganizer 
import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.ExecutorUtils

import com.android.wm.shell.common.ExternalInterfaceBinder

import com.android.wm.shell.common.LaunchAdjacentController

import com.android.wm.shell.common.RemoteCallable

import com.android.wm.shell.common.ShellExecutor

import com.android.wm.shell.common.SingleInstanceRemoteListener
@@ -78,6 +79,7 @@ class DesktopTasksController( 
        private val enterDesktopTaskTransitionHandler: EnterDesktopTaskTransitionHandler,

        private val exitDesktopTaskTransitionHandler: ExitDesktopTaskTransitionHandler,

        private val desktopModeTaskRepository: DesktopModeTaskRepository,

        private val launchAdjacentController: LaunchAdjacentController,

        @ShellMainThread private val mainExecutor: ShellExecutor

) : RemoteCallable<DesktopTasksController>, Transitions.TransitionHandler {
@@ -88,6 +90,11 @@ class DesktopTasksController( 
        visualIndicator?.releaseVisualIndicator(t)

        visualIndicator = null

    }

    private val taskVisibilityListener = object : VisibleTasksListener {

        override fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) {

            launchAdjacentController.launchAdjacentEnabled = !hasVisibleFreeformTasks

        }

    }



    init {

        desktopMode = DesktopModeImpl()
@@ -105,6 +112,7 @@ class DesktopTasksController( 
            this

        )

        transitions.addHandler(this)

        desktopModeTaskRepository.addVisibleTasksListener(taskVisibilityListener, mainExecutor)

    }



    /** Show all tasks, that are part of the desktop, on top of launcher */

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+7 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import com.android.wm.shell.common.DisplayController; 
import com.android.wm.shell.common.DisplayImeController;

import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.ExternalInterfaceBinder;

import com.android.wm.shell.common.LaunchAdjacentController;

import com.android.wm.shell.common.RemoteCallable;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.SingleInstanceRemoteListener;
@@ -170,6 +171,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
    private final TransactionPool mTransactionPool;

    private final IconProvider mIconProvider;

    private final Optional<RecentTasksController> mRecentTasksOptional;

    private final LaunchAdjacentController mLaunchAdjacentController;

    private final SplitScreenShellCommandHandler mSplitScreenShellCommandHandler;

    private final String[] mAppsSupportMultiInstances;
@@ -196,6 +198,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
            TransactionPool transactionPool,

            IconProvider iconProvider,

            Optional<RecentTasksController> recentTasks,

            LaunchAdjacentController launchAdjacentController,

            ShellExecutor mainExecutor) {

        mShellCommandHandler = shellCommandHandler;

        mShellController = shellController;
@@ -212,6 +215,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
        mTransactionPool = transactionPool;

        mIconProvider = iconProvider;

        mRecentTasksOptional = recentTasks;

        mLaunchAdjacentController = launchAdjacentController;

        mSplitScreenShellCommandHandler = new SplitScreenShellCommandHandler(this);

        // TODO(b/238217847): Temporarily add this check here until we can remove the dynamic

        //                    override for this controller from the base module
@@ -241,6 +245,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
            TransactionPool transactionPool,

            IconProvider iconProvider,

            RecentTasksController recentTasks,

            LaunchAdjacentController launchAdjacentController,

            ShellExecutor mainExecutor,

            StageCoordinator stageCoordinator) {

        mShellCommandHandler = shellCommandHandler;
@@ -258,6 +263,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
        mTransactionPool = transactionPool;

        mIconProvider = iconProvider;

        mRecentTasksOptional = Optional.of(recentTasks);

        mLaunchAdjacentController = launchAdjacentController;

        mStageCoordinator = stageCoordinator;

        mSplitScreenShellCommandHandler = new SplitScreenShellCommandHandler(this);

        shellInit.addInitCallback(this::onInit, this);
@@ -296,7 +302,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
        return new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,

                mTaskOrganizer, mDisplayController, mDisplayImeController,

                mDisplayInsetsController, mTransitions, mTransactionPool,

                mIconProvider, mMainExecutor, mRecentTasksOptional);

                mIconProvider, mMainExecutor, mRecentTasksOptional, mLaunchAdjacentController);

    }



    @Override