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

Commit ba89ef95 authored by mattsziklay's avatar mattsziklay
Browse files

Exit desktop mode on dragging a task to the top of the screen. 

This CL is part of the effort to implement desktop mode changes based on
drag gestures.

Bug: 247551213
Test: Drag a freeform task to the status bar area, confirm it exits
desktop mode for all tasks.

Change-Id: I44c147a4187466f98ab8f15e0bb050a56fbbe415
parent 5c4704b7

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

+4 −2
Original line number Diff line number Diff line
@@ -188,14 +188,16 @@ public abstract class WMShellModule { 
            @ShellMainThread Choreographer mainChoreographer,

            ShellTaskOrganizer taskOrganizer,

            DisplayController displayController,

            SyncTransactionQueue syncQueue) {

            SyncTransactionQueue syncQueue,

            @DynamicOverride DesktopModeController desktopModeController) {

        return new CaptionWindowDecorViewModel(

                        context,

                        mainHandler,

                        mainChoreographer,

                        taskOrganizer,

                        displayController,

                        syncQueue);

                        syncQueue,

                        desktopModeController);

    }



    //

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java

+19 −0
Original line number Diff line number Diff line
@@ -176,6 +176,25 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll 
        mShellTaskOrganizer.applyTransaction(wct);

    }



    /**

     * Turn desktop mode on or off

     * @param active the desired state for desktop mode setting

     */

    public void setDesktopModeActive(boolean active) {

        int value = active ? 1 : 0;

        Settings.System.putInt(mContext.getContentResolver(), Settings.System.DESKTOP_MODE, value);

    }



    /**

     * Returns the windowing mode of the display area with the specified displayId.

     * @param displayId

     * @return

     */

    public int getDisplayAreaWindowingMode(int displayId) {

        return mRootTaskDisplayAreaOrganizer.getDisplayAreaInfo(displayId)

                .configuration.windowConfiguration.getWindowingMode();

    }



    /**

     * A {@link ContentObserver} for listening to changes to {@link Settings.System#DESKTOP_MODE}

     */

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

+15 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.wm.shell.R; 
import com.android.wm.shell.ShellTaskOrganizer;

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

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

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

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

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

import com.android.wm.shell.transition.Transitions;
@@ -53,6 +54,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel<Caption 
    private final DisplayController mDisplayController;

    private final SyncTransactionQueue mSyncQueue;

    private FreeformTaskTransitionStarter mTransitionStarter;

    private DesktopModeController mDesktopModeController;



    public CaptionWindowDecorViewModel(

            Context context,
@@ -60,7 +62,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel<Caption 
            Choreographer mainChoreographer,

            ShellTaskOrganizer taskOrganizer,

            DisplayController displayController,

            SyncTransactionQueue syncQueue) {

            SyncTransactionQueue syncQueue,

            DesktopModeController desktopModeController) {

        mContext = context;

        mMainHandler = mainHandler;

        mMainChoreographer = mainChoreographer;
@@ -68,6 +71,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel<Caption 
        mTaskOrganizer = taskOrganizer;

        mDisplayController = displayController;

        mSyncQueue = syncQueue;

        mDesktopModeController = desktopModeController;

    }



    @Override
@@ -210,8 +214,10 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel<Caption 
        }



        private void handleEventForMove(MotionEvent e) {

            if (mTaskOrganizer.getRunningTaskInfo(mTaskId).getWindowingMode()

                    == WINDOWING_MODE_FULLSCREEN) {

            RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);

            int windowingMode =  mDesktopModeController

                    .getDisplayAreaWindowingMode(taskInfo.displayId);

            if (windowingMode == WINDOWING_MODE_FULLSCREEN) {

                return;

            }

            switch (e.getActionMasked()) {
@@ -229,8 +235,14 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel<Caption 
                case MotionEvent.ACTION_UP:

                case MotionEvent.ACTION_CANCEL: {

                    int dragPointerIdx = e.findPointerIndex(mDragPointerId);

                    int statusBarHeight = mDisplayController.getDisplayLayout(taskInfo.displayId)

                            .stableInsets().top;

                    mDragResizeCallback.onDragResizeEnd(

                            e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx));

                    if (e.getRawY(dragPointerIdx) <= statusBarHeight

                            && windowingMode == WINDOWING_MODE_FREEFORM) {

                        mDesktopModeController.setDesktopModeActive(false);

                    }

                    break;

                }

            }