Merge "Fixes the regression that the DesktopLaunchParams not working" into main (d02140d4) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -75,8 +75,8 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier {
		return RESULT_SKIP;
		}
		if (com.android.window.flags.Flags.fixLayoutExistingTask()
		&& task.getOrganizedTask() != null) {
		appendLog("task is organized, skipping");
		&& task.getCreatedByOrganizerTask() != null) {
		appendLog("has created-by-organizer-task, skipping");
		return RESULT_SKIP;
		}

		@@ -111,6 +111,11 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier {
		return RESULT_SKIP;
		}

		if ((options == null \|\| options.getLaunchBounds() == null) && task.hasOverrideBounds()) {
		appendLog("current task has bounds set, not overriding");
		return RESULT_SKIP;
		}

		DesktopModeBoundsCalculator.updateInitialBounds(task, layout, activity, options,
		outParams.mBounds, this::appendLog);
		appendLog("final desktop mode task bounds set to %s", outParams.mBounds);

+1 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,7 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier {
		// an existing task.
		adjustBoundsToAvoidConflictInDisplayArea(taskDisplayArea, outParams.mBounds);
		}
		} else {
		} else if (task == null \|\| !task.hasOverrideBounds()) {
		if (source != null && source.inFreeformWindowingMode()
		&& resolvedMode == WINDOWING_MODE_FREEFORM
		&& outParams.mBounds.isEmpty()