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

Commit 06341ecb authored by Toshiki Kikuchi's avatar Toshiki Kikuchi Committed by Android (Google) Code Review
Browse files

Merge "Allow Task#setDragResizing on W_M_MULTI_WINDOW" into main

parents 121a0b3d 2970ffce

services/core/java/com/android/server/wm/Task.java

+1 −1
Original line number Diff line number Diff line
@@ -2909,7 +2909,7 @@ class Task extends TaskFragment { 
        if (mDragResizing != dragResizing) {

            // No need to check if allowed if it's leaving dragResize

            if (dragResizing

                    && !(getRootTask().getWindowingMode() == WINDOWING_MODE_FREEFORM)) {

                    && !(getRootTask().getWindowConfiguration().canResizeTask())) {

                Slog.e(TAG, "Drag resize isn't allowed for root task id=" + getRootTaskId());

                return;

            }

services/tests/wmtests/src/com/android/server/wm/TaskTests.java

+29 −0
Original line number Diff line number Diff line
@@ -1583,6 +1583,35 @@ public class TaskTests extends WindowTestsBase { 
                task.getTopChild());

    }



    @Test

    public void testSetDragResizing() {

        final Task task = createTask(mDisplayContent);



        // Allowed for freeform.

        task.setWindowingMode(WINDOWING_MODE_FREEFORM);



        task.setDragResizing(true);

        assertTrue(task.isDragResizing());

        task.setDragResizing(false);

        assertFalse(task.isDragResizing());



        // Allowed for multi-window.

        task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);



        task.setDragResizing(true);

        assertTrue(task.isDragResizing());

        task.setDragResizing(false);

        assertFalse(task.isDragResizing());



        // Disallowed for fullscreen.

        task.setWindowingMode(WINDOWING_MODE_FULLSCREEN);



        task.setDragResizing(true);

        assertFalse(task.isDragResizing());

        task.setDragResizing(false);

        assertFalse(task.isDragResizing());

    }



    private Task getTestTask() {

        return new TaskBuilder(mSupervisor).setCreateActivity(true).build();

    }