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

Merge "Set the candidate task windowing mode" into tm-dev

Browse Source
This commit is contained in:
Louis Chang
2022-04-22 09:06:19 +00:00
committed by Android (Google) Code Review
parent a756b84369 e714cb1ab2
commit 8b8306913a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -2809,11 +2809,6 @@ class ActivityStarter {
} }
} }
if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED
&& intentTask.getWindowingMode() != mPreferredWindowingMode) {
intentTask.setWindowingMode(mPreferredWindowingMode);
}
// Update the target's launch cookie to those specified in the options if set // Update the target's launch cookie to those specified in the options if set
if (mStartActivity.mLaunchCookie != null) { if (mStartActivity.mLaunchCookie != null) {
intentActivity.mLaunchCookie = mStartActivity.mLaunchCookie; intentActivity.mLaunchCookie = mStartActivity.mLaunchCookie;

5
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -977,6 +977,11 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
candidateTask.reparent(this, onTop); candidateTask.reparent(this, onTop);
} }
} }
// Update windowing mode if necessary, e.g. launch into a different windowing mode.
if (windowingMode != WINDOWING_MODE_UNDEFINED && candidateTask.isRootTask()
&& candidateTask.getWindowingMode() != windowingMode) {
candidateTask.setWindowingMode(windowingMode);
}
return candidateTask.getRootTask(); return candidateTask.getRootTask();
} }
return new Task.Builder(mAtmService) return new Task.Builder(mAtmService)