Merge "Disable dynamic initial bounds for developer options in Beta 2" into main (be33599c) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeFlags.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ enum class DesktopModeFlags(
		TASK_STACK_OBSERVER_IN_SHELL(Flags::enableTaskStackObserverInShell, true),
		SIZE_CONSTRAINTS(Flags::enableDesktopWindowingSizeConstraints, true),
		DISABLE_SNAP_RESIZE(Flags::disableNonResizableAppSnapResizing, true),
		DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, true),
		DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, false),
		ENABLE_DESKTOP_WINDOWING_TASK_LIMIT(Flags::enableDesktopWindowingTaskLimit, true),
		BACK_NAVIGATION(Flags::enableDesktopWindowingBackNavigation, true),
		EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true),

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ public enum DesktopModeFlagsUtil {
		// All desktop mode related flags to be overridden by developer option toggle will be added here
		DESKTOP_WINDOWING_MODE(
		Flags::enableDesktopWindowingMode, /* shouldOverrideByDevOption= */ true),
		DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, true);
		DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, false);

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -234,11 +234,11 @@ public class DesktopModeFlagsUtilTest extends WindowTestsBase {
		FLAG_ENABLE_DESKTOP_WINDOWING_MODE,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		})
		public void isEnabled_dwFlagOn_overrideOff_featureFlagOn_returnsFalse() {
		public void isEnabled_dwFlagOn_overrideOff_featureFlagOn_returnsTrue() {
		setOverride(OVERRIDE_OFF.getSetting());

		// Follow override if they exist, and is not equal to default toggle state (dw flag)
		assertThat(DesktopModeFlagsUtil.DYNAMIC_INITIAL_BOUNDS.isEnabled(mContext)).isFalse();
		assertThat(DesktopModeFlagsUtil.DYNAMIC_INITIAL_BOUNDS.isEnabled(mContext)).isTrue();
		}

		@Test
		@@ -296,11 +296,11 @@ public class DesktopModeFlagsUtilTest extends WindowTestsBase {
		FLAG_ENABLE_DESKTOP_WINDOWING_MODE,
		FLAG_ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS
		})
		public void isEnabled_dwFlagOff_overrideOn_featureFlagOff_returnTrue() {
		public void isEnabled_dwFlagOff_overrideOn_featureFlagOff_returnFalse() {
		setOverride(OVERRIDE_ON.getSetting());

		// Follow override if they exist, and is not equal to default toggle state (dw flag)
		assertThat(DesktopModeFlagsUtil.DYNAMIC_INITIAL_BOUNDS.isEnabled(mContext)).isTrue();
		assertThat(DesktopModeFlagsUtil.DYNAMIC_INITIAL_BOUNDS.isEnabled(mContext)).isFalse();
		}

		@Test