Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8723f4a4 authored Apr 22, 2022 by Louis Chang Committed by Automerger Merge Worker Apr 22, 2022

Merge "Set the candidate task windowing mode" into tm-dev am: 8b830691 am:...

Merge "Set the candidate task windowing mode" into tm-dev am: 8b830691 am: ce628f6b am: 483670b1

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

Change-Id: I1d3825d104f1c92bea2987b6e6e41521737edb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ed5ffbcf 483670b1

services/core/java/com/android/server/wm/ActivityStarter.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -2815,11 +2815,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
		if (mStartActivity.mLaunchCookie != null) {
		intentActivity.mLaunchCookie = mStartActivity.mLaunchCookie;

services/core/java/com/android/server/wm/TaskDisplayArea.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -979,6 +979,11 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
		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 new Task.Builder(mAtmService)