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

Commit 175b32aa authored by Kazuki Takise's avatar Kazuki Takise Committed by Android (Google) Code Review
Browse files

Merge "Move display to top when task gets moved to front in desktop mode" into main

parents 015b5b6a 1bcc100c

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

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ class DesktopTasksController( 
    fun moveTaskToFront(taskInfo: RunningTaskInfo) {

        logV("moveTaskToFront taskId=%s", taskInfo.taskId)

        val wct = WindowContainerTransaction()

        wct.reorder(taskInfo.token, true)

        wct.reorder(taskInfo.token, true /* onTop */, true /* includingParents */)

        val taskToMinimize =

            addAndGetMinimizeChangesIfNeeded(taskInfo.displayId, wct, taskInfo.taskId)

        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

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

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
                final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);

                if (!taskInfo.isFocused) {

                    final WindowContainerTransaction wct = new WindowContainerTransaction();

                    wct.reorder(mTaskToken, true /* onTop */);

                    wct.reorder(mTaskToken, true /* onTop */, true /* includingParents */);

                    mSyncQueue.queue(wct);

                }

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ class FluidResizeTaskPositioner implements TaskPositioner, Transitions.Transitio 
        mDragStartListener.onDragStart(mWindowDecoration.mTaskInfo.taskId);

        if (mCtrlType != CTRL_TYPE_UNDEFINED && !mWindowDecoration.mTaskInfo.isFocused) {

            WindowContainerTransaction wct = new WindowContainerTransaction();

            wct.reorder(mWindowDecoration.mTaskInfo.token, true);

            wct.reorder(mWindowDecoration.mTaskInfo.token, true /* onTop */,

                    true /* includingParents */);

            mTaskOrganizer.applyTransaction(wct);

        }

        mRepositionTaskBounds.set(mTaskBoundsAtDragStart);

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

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ public class VeiledResizeTaskPositioner implements TaskPositioner, Transitions.T 
                    mDesktopWindowDecoration.mContext, mHandler, CUJ_DESKTOP_MODE_RESIZE_WINDOW);

            if (!mDesktopWindowDecoration.mTaskInfo.isFocused) {

                WindowContainerTransaction wct = new WindowContainerTransaction();

                wct.reorder(mDesktopWindowDecoration.mTaskInfo.token, true);

                wct.reorder(mDesktopWindowDecoration.mTaskInfo.token, true /* onTop */,

                        true /* includingParents */);

                mTaskOrganizer.applyTransaction(wct);

            }

        }