Merge "[dev_option] Add Initial bounds & Scaled resizing to Beta3 dev option" into main (e116ca15) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/DesktopModeFlags.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ public enum DesktopModeFlags {
		// All desktop mode related flags to be overridden by developer option toggle will be added here
		ENABLE_DESKTOP_WINDOWING_MODE(
		Flags::enableDesktopWindowingMode, /* shouldOverrideByDevOption= */ true),
		ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, false),
		ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, true),
		ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION(
		Flags::enableCaptionCompatInsetForceConsumption, true),
		ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS(
		@@ -58,12 +58,13 @@ public enum DesktopModeFlags {
		ENABLE_TASK_STACK_OBSERVER_IN_SHELL(Flags::enableTaskStackObserverInShell, true),
		ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS(Flags::enableDesktopWindowingSizeConstraints, true),
		DISABLE_NON_RESIZABLE_APP_SNAP_RESIZE(Flags::disableNonResizableAppSnapResizing, true),
		ENABLE_WINDOWING_SCALED_RESIZING(Flags::enableWindowingScaledResizing, false),
		ENABLE_WINDOWING_SCALED_RESIZING(Flags::enableWindowingScaledResizing, true),
		ENABLE_DESKTOP_WINDOWING_TASK_LIMIT(Flags::enableDesktopWindowingTaskLimit, true),
		ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION(Flags::enableDesktopWindowingBackNavigation, true),
		ENABLE_WINDOWING_EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true),
		ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS(
		Flags::enableDesktopWindowingTaskbarRunningApps, true);
		Flags::enableDesktopWindowingTaskbarRunningApps, true),
		ENABLE_DESKTOP_WINDOWING_TRANSITIONS(Flags::enableDesktopWindowingTransitions, false);

		private static final String TAG = "DesktopModeFlagsUtil";
		// Function called to obtain aconfig flag value.

core/tests/coretests/src/android/window/flags/DesktopModeFlagsTest.java

+25 −25

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSE
		import static android.window.flags.DesktopModeFlags.ToggleOverride.fromSetting;

		import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE;
		import static com.android.window.flags.Flags.FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS;
		import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS;
		import static com.android.window.flags.Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION;

		import static com.google.common.truth.Truth.assertThat;
		@@ -198,145 +198,145 @@ public class DesktopModeFlagsTest {

		@Test
		@EnableFlags({FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION, FLAG_ENABLE_DESKTOP_WINDOWING_MODE,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS})
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS})
		public void isTrue_dwFlagOn_overrideUnset_featureFlagOn_returnsTrue() {
		setOverride(OVERRIDE_UNSET_SETTING);

		// For unset overrides, follow flag
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isTrue();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();
		}

		@Test
		@EnableFlags({FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION, FLAG_ENABLE_DESKTOP_WINDOWING_MODE})
		@DisableFlags(FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS)
		@DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS)
		public void isTrue_dwFlagOn_overrideUnset_featureFlagOff_returnsFalse() {
		setOverride(OVERRIDE_UNSET_SETTING);
		// For unset overrides, follow flag
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isFalse();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();
		}

		@Test
		@EnableFlags({
		FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION,
		FLAG_ENABLE_DESKTOP_WINDOWING_MODE,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS
		})
		public void isTrue_dwFlagOn_overrideOn_featureFlagOn_returnsTrue() {
		setOverride(OVERRIDE_ON_SETTING);

		// When toggle override matches its default state (dw flag), don't override flags
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isTrue();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();
		}

		@Test
		@EnableFlags({FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION, FLAG_ENABLE_DESKTOP_WINDOWING_MODE})
		@DisableFlags(FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS)
		@DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS)
		public void isTrue_dwFlagOn_overrideOn_featureFlagOff_returnsFalse() {
		setOverride(OVERRIDE_ON_SETTING);

		// When toggle override matches its default state (dw flag), don't override flags
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isFalse();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();
		}

		@Test
		@EnableFlags({
		FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION,
		FLAG_ENABLE_DESKTOP_WINDOWING_MODE,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS
		})
		public void isTrue_dwFlagOn_overrideOff_featureFlagOn_returnsTrue() {
		setOverride(OVERRIDE_OFF_SETTING);

		// Follow override if they exist, and is not equal to default toggle state (dw flag)
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isTrue();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();
		}

		@Test
		@EnableFlags({FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION, FLAG_ENABLE_DESKTOP_WINDOWING_MODE})
		@DisableFlags(FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS)
		@DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS)
		public void isTrue_dwFlagOn_overrideOff_featureFlagOff_returnsFalse() {
		setOverride(OVERRIDE_OFF_SETTING);

		// Follow override if they exist, and is not equal to default toggle state (dw flag)
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isFalse();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();
		}

		@Test
		@EnableFlags({
		FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS
		})
		@DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
		public void isTrue_dwFlagOff_overrideUnset_featureFlagOn_returnsTrue() {
		setOverride(OVERRIDE_UNSET_SETTING);

		// For unset overrides, follow flag
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isTrue();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();
		}

		@Test
		@EnableFlags(FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION)
		@DisableFlags({
		FLAG_ENABLE_DESKTOP_WINDOWING_MODE,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS
		})
		public void isTrue_dwFlagOff_overrideUnset_featureFlagOff_returnsFalse() {
		setOverride(OVERRIDE_UNSET_SETTING);

		// For unset overrides, follow flag
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isFalse();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();
		}

		@Test
		@EnableFlags({
		FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS
		})
		@DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
		public void isTrue_dwFlagOff_overrideOn_featureFlagOn_returnsTrue() {
		setOverride(OVERRIDE_ON_SETTING);

		// Follow override if they exist, and is not equal to default toggle state (dw flag)
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isTrue();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();
		}

		@Test
		@EnableFlags(FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION)
		@DisableFlags({
		FLAG_ENABLE_DESKTOP_WINDOWING_MODE,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS
		})
		public void isTrue_dwFlagOff_overrideOn_featureFlagOff_returnFalse() {
		setOverride(OVERRIDE_ON_SETTING);

		// Follow override if they exist, and is not equal to default toggle state (dw flag)
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isFalse();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();
		}

		@Test
		@EnableFlags({
		FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS
		})
		@DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
		public void isTrue_dwFlagOff_overrideOff_featureFlagOn_returnsTrue() {
		setOverride(OVERRIDE_OFF_SETTING);

		// When toggle override matches its default state (dw flag), don't override flags
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isTrue();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();
		}

		@Test
		@EnableFlags(FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION)
		@DisableFlags({
		FLAG_ENABLE_DESKTOP_WINDOWING_MODE,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS
		})
		public void isTrue_dwFlagOff_overrideOff_featureFlagOff_returnsFalse() {
		setOverride(OVERRIDE_OFF_SETTING);

		// When toggle override matches its default state (dw flag), don't override flags
		assertThat(DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()).isFalse();
		assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();
		}

		@Test