diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 2 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/TaskTests.java | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 71dbd29a0410..af86a88942f2 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -2914,7 +2914,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; } diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java index 0c580697bc4a..b5cf06aa459f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java @@ -1579,6 +1579,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(); } |