Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6691abe1 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas
Browse files

Disable dynamic initial bounds for developer options in Beta 2 

Flag: NONE(disabling for developers)
Test: atest WmTests:DesktopModeFlagsUtilTest
Fixes: 362677170
Change-Id: Ica8ab46c01a111dbc88ce2eae29ec47b12cd1fc1
parent 031e5cd3

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,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),

services/core/java/com/android/server/wm/utils/DesktopModeFlagsUtil.java

+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.

services/tests/wmtests/src/com/android/server/wm/utils/DesktopModeFlagsUtilTest.java

+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