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

Commit b6cdcf3b authored by Saho Kobayashi's avatar Saho Kobayashi Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary reorder on resize start" into main

parents 958d7c4b 1e6cb467

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

+0 −6
Original line number Diff line number Diff line
@@ -97,12 +97,6 @@ class FluidResizeTaskPositioner implements TaskPositioner, Transitions.Transitio 
        mTaskBoundsAtDragStart.set(

                mWindowDecoration.getTaskInfo().configuration.windowConfiguration.getBounds());

        mRepositionStartPoint.set(x, y);

        if (mCtrlType != CTRL_TYPE_UNDEFINED && !mWindowDecoration.getHasGlobalFocus()) {

            WindowContainerTransaction wct = new WindowContainerTransaction();

            wct.reorder(mWindowDecoration.getTaskInfo().token, true /* onTop */,

                    true /* includingParents */);

            mTaskOrganizer.applyTransaction(wct);

        }

        mRepositionTaskBounds.set(mTaskBoundsAtDragStart);

        int rotation = mWindowDecoration

                .getTaskInfo().configuration.windowConfiguration.getDisplayRotation();

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MultiDisplayVeiledResizeTaskPositioner.kt

+0 −9
Original line number Diff line number Diff line
@@ -114,15 +114,6 @@ class MultiDisplayVeiledResizeTaskPositioner( 
            interactionJankMonitor.begin(

                createLongTimeoutJankConfigBuilder(Cuj.CUJ_DESKTOP_MODE_RESIZE_WINDOW)

            )

            if (!windowDecoration.hasGlobalFocus) {

                val wct = WindowContainerTransaction()

                wct.reorder(

                    windowDecoration.taskInfo.token,

                    /* onTop= */ true,

                    /* includingParents= */ true,

                )

                taskOrganizer.applyTransaction(wct)

            }

        }

        repositionTaskBounds.set(taskBoundsAtDragStart)

        val rotation =

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

+0 −6
Original line number Diff line number Diff line
@@ -120,12 +120,6 @@ public class VeiledResizeTaskPositioner implements TaskPositioner, Transitions.T 
            // Capture CUJ for re-sizing window in DW mode.

            mInteractionJankMonitor.begin(

                    createLongTimeoutJankConfigBuilder(CUJ_DESKTOP_MODE_RESIZE_WINDOW));

            if (!mWindowDecoration.getHasGlobalFocus()) {

                WindowContainerTransaction wct = new WindowContainerTransaction();

                wct.reorder(mWindowDecoration.getTaskInfo().token, true /* onTop */,

                        true /* includingParents */);

                mTaskOrganizer.applyTransaction(wct);

            }

        }

        mRepositionTaskBounds.set(mTaskBoundsAtDragStart);

        int rotation = mWindowDecoration

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/FluidResizeTaskPositionerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ class FluidResizeTaskPositionerTest : ShellTestCase() { 
        )



        // Verify task is reordered to top

        verify(mockShellTaskOrganizer).applyTransaction(argThat { wct ->

        verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct ->

            return@argThat wct.hierarchyOps.any { hierarchyOps ->

                hierarchyOps.container == taskBinder && hierarchyOps.toTop }

        })

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/MultiDisplayVeiledResizeTaskPositionerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ class MultiDisplayVeiledResizeTaskPositionerTest : ShellTestCase() { 
        )



        // Verify task is reordered to top

        verify(mockShellTaskOrganizer)

        verify(mockShellTaskOrganizer, never())

            .applyTransaction(

                argThat { wct ->

                    return@argThat wct.hierarchyOps.any { hierarchyOps ->