Merge "Remove fix_task_compatible_modes flag" into main (15621fc4) · Commits · e / os / android_frameworks_base

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -105,17 +105,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		namespace: "windowing_sdk"
		name: "fix_task_compatible_modes"
		description: "Make most of the windowing modes compatible"
		bug: "427336494"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "task_fragment_companion_activity"

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

+3 −16

Original line number	Diff line number	Diff line
		@@ -24,11 +24,8 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
		import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
		import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
		import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
		@@ -2072,18 +2069,8 @@ class RecentTasks {
		final int windowingMode1 = t1.getWindowingMode();
		final int windowingMode2 = t2.getWindowingMode();

		if (com.android.window.flags.Flags.fixTaskCompatibleModes()) {
		// Unless one of them is pinned and the other is not, all modes are compatible.
		return (windowingMode1 == windowingMode2) \|\| (windowingMode1 != WINDOWING_MODE_PINNED
		&& windowingMode2 != WINDOWING_MODE_PINNED);
		} else {
		return windowingMode1 == windowingMode2
		\|\| windowingMode1 == WINDOWING_MODE_UNDEFINED
		\|\| windowingMode2 == WINDOWING_MODE_UNDEFINED
		\|\| (windowingMode1 == WINDOWING_MODE_FREEFORM
		&& windowingMode2 == WINDOWING_MODE_FULLSCREEN)
		\|\| (windowingMode1 == WINDOWING_MODE_FULLSCREEN
		&& windowingMode2 == WINDOWING_MODE_FREEFORM);
		}
		}
		}

services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.UserManager;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.annotations.Presubmit;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.util.ArraySet;
		@@ -87,7 +86,6 @@ import android.window.TaskSnapshot;
		import androidx.test.filters.MediumTest;

		import com.android.server.wm.RecentTasks.Callbacks;
		import com.android.window.flags.Flags;

		import org.junit.Before;
		import org.junit.Rule;
		@@ -440,7 +438,6 @@ public class RecentTasksTest extends WindowTestsBase {
		}

		@Test
		@EnableFlags(Flags.FLAG_FIX_TASK_COMPATIBLE_MODES)
		public void testAddTaskCompatibleWindowingMode_withMultiWindowAndFullscreen_expectRemove() {
		verifyCompatibleWindowingModeWithFullscreen(WINDOWING_MODE_MULTI_WINDOW);
		}