Merge "Cleanup update_task_min_dimensions_with_root_activity" into main (08b7bddc) · Commits · e / os / android_frameworks_base

core/java/android/app/TaskInfo.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -571,8 +571,7 @@ public class TaskInfo {
		&& appCompatTaskInfo.equalsForTaskOrganizer(that.appCompatTaskInfo)
		&& Objects.equals(topActivityMainWindowFrame, that.topActivityMainWindowFrame)
		&& isAppBubble == that.isAppBubble
		&& (!com.android.window.flags.Flags.updateTaskMinDimensionsWithRootActivity()
		\|\| (minWidth == that.minWidth && minHeight == that.minHeight));
		&& minWidth == that.minWidth && minHeight == that.minHeight;
		}

		/**

+0 −10

Original line number	Diff line number	Diff line
		@@ -119,16 +119,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		namespace: "windowing_sdk"
		name: "update_task_min_dimensions_with_root_activity"
		description: "Update minWidth/Height when the root activity is changed."
		bug: "416987720"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "fallback_to_focused_display"

+8 −18

Original line number	Diff line number	Diff line
		@@ -698,9 +698,6 @@ class Task extends TaskFragment {
		mResizeMode = resizeMode;
		if (info != null) {
		setIntent(_intent, info);
		if (!Flags.updateTaskMinDimensionsWithRootActivity()) {
		setMinDimensions(info);
		}
		} else {
		intent = _intent;
		mMinWidth = minWidth;
		@@ -731,9 +728,6 @@ class Task extends TaskFragment {
		voiceSession = _voiceSession;
		voiceInteractor = _voiceInteractor;
		setIntent(activity, intent, info);
		if (!Flags.updateTaskMinDimensionsWithRootActivity()) {
		setMinDimensions(info);
		}
		// Before we began to reuse a root task as the leaf task, we used to
		// create a leaf task in this case. Therefore now we won't send out the task created
		// notification when we decide to reuse it here, so we send out the notification below.
		@@ -1067,11 +1061,9 @@ class Task extends TaskFragment {
		mResizeMode = info.resizeMode;
		shouldUpdateTaskDescription = true;
		}
		if (Flags.updateTaskMinDimensionsWithRootActivity()) {
		if (setMinDimensions(info)) {
		shouldUpdateTaskDescription = true;
		}
		}
		if (shouldUpdateTaskDescription) {
		updateTaskDescription();
		}
		@@ -1103,14 +1095,12 @@ class Task extends TaskFragment {
		}
		mMinWidth = minWidth;
		mMinHeight = minHeight;
		if (Flags.updateTaskMinDimensionsWithRootActivity()) {
		// Only update for pure TaskFragment.
		forAllTaskFragments(tf -> {
		if (tf.asTask() == null) {
		tf.setMinDimensions(minWidth, minHeight);
		}
		});
		}
		return true;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -2212,7 +2212,6 @@ public class TaskTests extends WindowTestsBase {
		assertFalse(task.isForceExcludedFromRecents());
		}

		@EnableFlags(Flags.FLAG_UPDATE_TASK_MIN_DIMENSIONS_WITH_ROOT_ACTIVITY)
		@Test
		public void testAllowRelingquish_updateMinDimensions() {
		// r0 allows relingquish
		@@ -2237,7 +2236,6 @@ public class TaskTests extends WindowTestsBase {
		assertEquals(500, task.mMinHeight);
		}

		@EnableFlags(Flags.FLAG_UPDATE_TASK_MIN_DIMENSIONS_WITH_ROOT_ACTIVITY)
		@Test
		public void testDisallowRelingquish_notUpdateMinDimensions() {
		// r0 disallows relingquish