Merge "Remove fix_layout_restored_task flag" into main (09f868bc) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_sdk.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -130,17 +130,6 @@ flag {
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "fix_layout_restored_task"
		description: "Layout the restored-from-recent task to ensure the bounds are updated."
		bug: "416441150"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "update_task_min_dimensions_with_root_activity"

+2 −3

Original line number	Diff line number	Diff line
		@@ -1124,8 +1124,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		*/
		private void prepareTasksForSplitScreen(int[] taskIds, WindowContainerTransaction wct,
		Bundle[] bundles) {
		if (com.android.window.flags.Flags.fixLayoutRestoredTask()
		&& taskIds.length != bundles.length) {
		if (taskIds.length != bundles.length) {
		Slog.w(TAG, "The length of taskIds and bundles are not the same.");
		return;
		}
		@@ -1136,7 +1135,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		if (task != null) {
		wct.setWindowingMode(task.getToken(), WINDOWING_MODE_UNDEFINED)
		.setBounds(task.getToken(), null /* bounds */);
		} else if (com.android.window.flags.Flags.fixLayoutRestoredTask()) {
		} else {
		// Clear the task bounds via Bundle once the Task is restored.
		ActivityOptions options = ActivityOptions.fromBundle(bundles[i]);
		if (options == null) {

+3 −5

Original line number	Diff line number	Diff line
		@@ -2047,11 +2047,9 @@ class ActivityStarter {
		? mSourceRecord.getTask() : null;
		setNewTask(taskToAffiliate);
		} else if (mAddingToTask) {
		if (com.android.window.flags.Flags.fixLayoutRestoredTask()) {
		// Layout the task to ensure the Task is in correct bounds.
		mSupervisor.getLaunchParamsController().layoutTask(targetTask,
		mStartActivity.info.windowLayout, mStartActivity, mSourceRecord, options);
		}
		addOrReparentStartingActivity(targetTask, "adding to task");
		}