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

Merge "Modify multi-display Activity launching behavior" into sc-dev

Browse Source
This commit is contained in:
Sean Stout
2021-03-08 20:47:17 +00:00
committed by Android (Google) Code Review
parent 061b3bd32b 79ce09a0fc
commit 632e4351ae
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java
View File

@@ -406,6 +406,12 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier {
}
}
if (taskDisplayArea == null && source != null) {
final TaskDisplayArea sourceDisplayArea = source.getDisplayArea();
if (DEBUG) appendLog("display-area-from-source=" + sourceDisplayArea);
taskDisplayArea = sourceDisplayArea;
}
Task rootTask = (taskDisplayArea == null && task != null)
? task.getRootTask() : null;
if (rootTask != null) {
@@ -413,12 +419,6 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier {
taskDisplayArea = rootTask.getDisplayArea();
}
if (taskDisplayArea == null && source != null) {
final TaskDisplayArea sourceDisplayArea = source.getDisplayArea();
if (DEBUG) appendLog("display-area-from-source=" + sourceDisplayArea);
taskDisplayArea = sourceDisplayArea;
}
if (taskDisplayArea == null && options != null) {
final int callerDisplayId = options.getCallerDisplayId();
final DisplayContent dc =

4
services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java
View File

@@ -195,7 +195,7 @@ public class TaskLaunchParamsModifierTests extends WindowTestsBase {
}
@Test
public void testUsesTasksDisplayAreaIdPriorToSourceIfSet() {
public void testUsesSourcesDisplayAreaIdPriorToTaskIfSet() {
final TestDisplayContent freeformDisplay = createNewDisplayContent(
WINDOWING_MODE_FREEFORM);
final TestDisplayContent fullscreenDisplay = createNewDisplayContent(
@@ -211,7 +211,7 @@ public class TaskLaunchParamsModifierTests extends WindowTestsBase {
.setSource(source)
.calculate());
assertEquals(fullscreenDisplay.getDefaultTaskDisplayArea(),
assertEquals(freeformDisplay.getDefaultTaskDisplayArea(),
mResult.mPreferredTaskDisplayArea);
}