Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bring task to front when resizing" into udc-dev am: 1b2eeb06dd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23043456

Change-Id: I275abe9d0a598c5ae8fd39cef697c6a7aa883b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maryam Dehaini
2023-05-10 20:44:58 +00:00
committed by Automerger Merge Worker
parent da3b558972 1b2eeb06dd
commit 1a249ba9a4
4 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,11 @@ class FluidResizeTaskPositioner implements DragPositioningCallback {
mWindowDecoration.mTaskInfo.configuration.windowConfiguration.getBounds());
mRepositionStartPoint.set(x, y);
mDragStartListener.onDragStart(mWindowDecoration.mTaskInfo.taskId);
if (mCtrlType != CTRL_TYPE_UNDEFINED && !mWindowDecoration.mTaskInfo.isFocused) {
WindowContainerTransaction wct = new WindowContainerTransaction();
wct.reorder(mWindowDecoration.mTaskInfo.token, true);
mTaskOrganizer.applyTransaction(wct);
}
mRepositionTaskBounds.set(mTaskBoundsAtDragStart);
}

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

@@ -78,6 +78,11 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback {
mRepositionStartPoint.set(x, y);
if (isResizing()) {
mDesktopWindowDecoration.showResizeVeil();
if (!mDesktopWindowDecoration.mTaskInfo.isFocused) {
WindowContainerTransaction wct = new WindowContainerTransaction();
wct.reorder(mDesktopWindowDecoration.mTaskInfo.token, true);
mTaskOrganizer.applyTransaction(wct);
}
}
mHasDragResized = false;
mDragStartListener.onDragStart(mDesktopWindowDecoration.mTaskInfo.taskId);

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

@@ -565,6 +565,55 @@ class FluidResizeTaskPositionerTest : ShellTestCase() {
bounds == configuration.windowConfiguration.bounds
}
@Test
fun testDragResize_resize_resizingTaskReorderedToTopWhenNotFocused() {
mockWindowDecoration.mTaskInfo.isFocused = false
taskPositioner.onDragPositioningStart(
CTRL_TYPE_RIGHT, // Resize right
STARTING_BOUNDS.left.toFloat(),
STARTING_BOUNDS.top.toFloat()
)
// Verify task is reordered to top
verify(mockShellTaskOrganizer).applyTransaction(argThat { wct ->
return@argThat wct.hierarchyOps.any { hierarchyOps ->
hierarchyOps.container == taskBinder && hierarchyOps.toTop }
})
}
@Test
fun testDragResize_resize_resizingTaskNotReorderedToTopWhenFocused() {
mockWindowDecoration.mTaskInfo.isFocused = true
taskPositioner.onDragPositioningStart(
CTRL_TYPE_RIGHT, // Resize right
STARTING_BOUNDS.left.toFloat(),
STARTING_BOUNDS.top.toFloat()
)
// Verify task is not reordered to top
verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct ->
return@argThat wct.hierarchyOps.any { hierarchyOps ->
hierarchyOps.container == taskBinder && hierarchyOps.toTop }
})
}
@Test
fun testDragResize_drag_draggedTaskNotReorderedToTop() {
mockWindowDecoration.mTaskInfo.isFocused = false
taskPositioner.onDragPositioningStart(
CTRL_TYPE_UNDEFINED, // drag
STARTING_BOUNDS.left.toFloat(),
STARTING_BOUNDS.top.toFloat()
)
// Verify task is not reordered to top since task is already brought to top before dragging
// begins
verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct ->
return@argThat wct.hierarchyOps.any { hierarchyOps ->
hierarchyOps.container == taskBinder && hierarchyOps.toTop }
})
}
companion object {
private const val TASK_ID = 5
private const val MIN_WIDTH = 10

49
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositionerTest.kt
View File

@@ -271,6 +271,55 @@ class VeiledResizeTaskPositionerTest : ShellTestCase() {
})
}
@Test
fun testDragResize_resize_resizingTaskReorderedToTopWhenNotFocused() {
mockDesktopWindowDecoration.mTaskInfo.isFocused = false
taskPositioner.onDragPositioningStart(
CTRL_TYPE_RIGHT, // Resize right
STARTING_BOUNDS.left.toFloat(),
STARTING_BOUNDS.top.toFloat()
)
// Verify task is reordered to top
verify(mockShellTaskOrganizer).applyTransaction(argThat { wct ->
return@argThat wct.hierarchyOps.any { hierarchyOps ->
hierarchyOps.container == taskBinder && hierarchyOps.toTop }
})
}
@Test
fun testDragResize_resize_resizingTaskNotReorderedToTopWhenFocused() {
mockDesktopWindowDecoration.mTaskInfo.isFocused = true
taskPositioner.onDragPositioningStart(
CTRL_TYPE_RIGHT, // Resize right
STARTING_BOUNDS.left.toFloat(),
STARTING_BOUNDS.top.toFloat()
)
// Verify task is not reordered to top
verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct ->
return@argThat wct.hierarchyOps.any { hierarchyOps ->
hierarchyOps.container == taskBinder && hierarchyOps.toTop }
})
}
@Test
fun testDragResize_drag_draggedTaskNotReorderedToTop() {
mockDesktopWindowDecoration.mTaskInfo.isFocused = false
taskPositioner.onDragPositioningStart(
CTRL_TYPE_UNDEFINED, // drag
STARTING_BOUNDS.left.toFloat(),
STARTING_BOUNDS.top.toFloat()
)
// Verify task is not reordered to top since task is already brought to top before dragging
// begins
verify(mockShellTaskOrganizer, never()).applyTransaction(argThat { wct ->
return@argThat wct.hierarchyOps.any { hierarchyOps ->
hierarchyOps.container == taskBinder && hierarchyOps.toTop }
})
}
companion object {
private const val TASK_ID = 5
private const val MIN_WIDTH = 10