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

Merge "Let DesktopModeController reorder tasks on TO_FRONT transitions" into tm-qpr-dev

Browse Source
This commit is contained in:
Jorge Gil
2022-12-12 17:11:23 +00:00
committed by Android (Google) Code Review
parent af6ed7e4d9 9792d963ba
commit 33b9c7f1e0
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java
View File

@@ -40,6 +40,7 @@ import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.util.ArraySet; import android.util.ArraySet;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.view.WindowManager;
import android.window.DisplayAreaInfo; import android.window.DisplayAreaInfo;
import android.window.TransitionInfo; import android.window.TransitionInfo;
import android.window.TransitionRequestInfo; import android.window.TransitionRequestInfo;
@@ -329,15 +330,17 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll
@Override @Override
public WindowContainerTransaction handleRequest(@NonNull IBinder transition, public WindowContainerTransaction handleRequest(@NonNull IBinder transition,
@NonNull TransitionRequestInfo request) { @NonNull TransitionRequestInfo request) {
// Only do anything if we are in desktop mode and opening a task/app in freeform // Only do anything if we are in desktop mode and opening/moving-to-front a task/app in
// freeform
if (!DesktopModeStatus.isActive(mContext)) { if (!DesktopModeStatus.isActive(mContext)) {
ProtoLog.d(WM_SHELL_DESKTOP_MODE, ProtoLog.d(WM_SHELL_DESKTOP_MODE,
"skip shell transition request: desktop mode not active"); "skip shell transition request: desktop mode not active");
return null; return null;
} }
if (request.getType() != TRANSIT_OPEN) { if (request.getType() != TRANSIT_OPEN && request.getType() != TRANSIT_TO_FRONT) {
ProtoLog.d(WM_SHELL_DESKTOP_MODE, ProtoLog.d(WM_SHELL_DESKTOP_MODE,
"skip shell transition request: only supports TRANSIT_OPEN"); "skip shell transition request: unsupported type %s",
WindowManager.transitTypeToString(request.getType()));
return null; return null;
} }
if (request.getTriggerTask() == null if (request.getTriggerTask() == null

18
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeControllerTest.java
View File

@@ -23,6 +23,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.app.WindowConfiguration.WINDOW_CONFIG_BOUNDS; import static android.app.WindowConfiguration.WINDOW_CONFIG_BOUNDS;
import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_CHANGE;
import static android.view.WindowManager.TRANSIT_CLOSE;
import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_OPEN;
import static android.view.WindowManager.TRANSIT_TO_FRONT; import static android.view.WindowManager.TRANSIT_TO_FRONT;
import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REORDER; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REORDER;
@@ -334,10 +335,10 @@ public class DesktopModeControllerTest extends ShellTestCase {
} }
@Test @Test
public void testHandleTransitionRequest_notTransitOpen_returnsNull() { public void testHandleTransitionRequest_unsupportedTransit_returnsNull() {
WindowContainerTransaction wct = mController.handleRequest( WindowContainerTransaction wct = mController.handleRequest(
new Binder(), new Binder(),
new TransitionRequestInfo(TRANSIT_TO_FRONT, null /* trigger */, null /* remote */)); new TransitionRequestInfo(TRANSIT_CLOSE, null /* trigger */, null /* remote */));
assertThat(wct).isNull(); assertThat(wct).isNull();
} }
@@ -352,7 +353,7 @@ public class DesktopModeControllerTest extends ShellTestCase {
} }
@Test @Test
public void testHandleTransitionRequest_returnsWct() { public void testHandleTransitionRequest_taskOpen_returnsWct() {
RunningTaskInfo trigger = new RunningTaskInfo(); RunningTaskInfo trigger = new RunningTaskInfo();
trigger.token = new MockToken().mToken; trigger.token = new MockToken().mToken;
trigger.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM); trigger.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM);
@@ -362,6 +363,17 @@ public class DesktopModeControllerTest extends ShellTestCase {
assertThat(wct).isNotNull(); assertThat(wct).isNotNull();
} }
@Test
public void testHandleTransitionRequest_taskToFront_returnsWct() {
RunningTaskInfo trigger = new RunningTaskInfo();
trigger.token = new MockToken().mToken;
trigger.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM);
WindowContainerTransaction wct = mController.handleRequest(
mock(IBinder.class),
new TransitionRequestInfo(TRANSIT_TO_FRONT, trigger, null /* remote */));
assertThat(wct).isNotNull();
}
private DesktopModeController createController() { private DesktopModeController createController() {
return new DesktopModeController(mContext, mShellInit, mShellController, return new DesktopModeController(mContext, mShellInit, mShellController,
mShellTaskOrganizer, mRootTaskDisplayAreaOrganizer, mTransitions, mShellTaskOrganizer, mRootTaskDisplayAreaOrganizer, mTransitions,