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

Commit fb112f07 authored by Cairn Overturf's avatar Cairn Overturf
Browse files

Fix freeform box shadow test 

Flag: EXEMPT bugfix
Bug: 367464660
Test: presubmit
Change-Id: Ie0753938fd2a0e2bfd2d4c5dea2b3baabf861884
parent 76f860ed

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java

+55 −19
Original line number Diff line number Diff line
@@ -356,7 +356,8 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX)

    @DisableFlags({Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX,

            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS})

    public void updateRelayoutParams_noSysPropFlagsSet_windowShadowsAreSetForFreeform_dynamicDisabled() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM);
@@ -369,7 +370,8 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX)

    @DisableFlags({Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX,

            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS})

    public void updateRelayoutParams_noSysPropFlagsSet_windowShadowsAreNotSetForFullscreen_dynamicDisabled() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
@@ -381,7 +383,8 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX)

    @DisableFlags({Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX,

            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS})

    public void updateRelayoutParams_noSysPropFlagsSet_windowShadowsAreNotSetForSplit_dynamicDisabled() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
@@ -463,6 +466,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX)

    @DisableFlags(Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS)

    public void updateRelayoutParams_noSysPropFlagsSet_windowShadowsAreSetForFreeform() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM);
@@ -475,6 +479,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX)

    @DisableFlags(Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS)

    public void updateRelayoutParams_noSysPropFlagsSet_windowShadowsAreNotSetForFullscreen() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
@@ -487,6 +492,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX)

    @DisableFlags(Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS)

    public void updateRelayoutParams_noSysPropFlagsSet_windowShadowsAreNotSetForSplit() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
@@ -499,6 +505,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX)

    @DisableFlags(Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS)

    public void updateRelayoutParams_noSysPropFlagsSet_roundedCornersSetForFreeform() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM);
@@ -509,6 +516,51 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 
        assertThat(relayoutParams.mShadowRadiusId).isNotEqualTo(Resources.ID_NULL);

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS)

    public void updateRelayoutParams_windowBoxShadowsAreSetForFreeform() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM);

        RelayoutParams relayoutParams = new RelayoutParams();



        updateRelayoutParams(relayoutParams, taskInfo);



        assertThat(relayoutParams.mBoxShadowSettingsIds.length).isGreaterThan(0);

        for (int i = 0; i < relayoutParams.mBoxShadowSettingsIds.length; i++) {

            assertThat(relayoutParams.mBoxShadowSettingsIds[i]).isNotEqualTo(Resources.ID_NULL);

        }

        assertThat(relayoutParams.mBorderSettingsId).isNotEqualTo(Resources.ID_NULL);

    }





    @Test

    @EnableFlags({Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX,

            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS})

    public void updateRelayoutParams_noSysPropFlagsSet_windowBoxShadowsAreNotSetForFullscreen() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN);

        RelayoutParams relayoutParams = new RelayoutParams();



        updateRelayoutParams(relayoutParams, taskInfo);



        assertThat(relayoutParams.mBoxShadowSettingsIds).isEqualTo(null);

        assertThat(relayoutParams.mBorderSettingsId).isEqualTo(Resources.ID_NULL);

    }



    @Test

    @EnableFlags({Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX,

            Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS})

    public void updateRelayoutParams_noSysPropFlagsSet_windowBoxShadowsAreNotSetForSplit() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        RelayoutParams relayoutParams = new RelayoutParams();



        updateRelayoutParams(relayoutParams, taskInfo);



        assertThat(relayoutParams.mBoxShadowSettingsIds).isEqualTo(null);

        assertThat(relayoutParams.mBorderSettingsId).isEqualTo(Resources.ID_NULL);

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX)

    public void updateRelayoutParams_noSysPropFlagsSet_roundedCornersNotSetForFullscreen() {
@@ -562,22 +614,6 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 
        assertThat(relayoutParams.mCornerRadiusId).isEqualTo(Resources.ID_NULL);

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_FREEFORM_BOX_SHADOWS)

    public void updateRelayoutParams_boxShadowsAndOutlineSetForFreeform() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true);

        taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM);

        RelayoutParams relayoutParams = new RelayoutParams();



        updateRelayoutParams(relayoutParams, taskInfo);



        assertThat(relayoutParams.mBoxShadowSettingsIds.length).isGreaterThan(0);

        for (int i = 0; i < relayoutParams.mBoxShadowSettingsIds.length; i++) {

            assertThat(relayoutParams.mBoxShadowSettingsIds[i]).isNotEqualTo(Resources.ID_NULL);

        }

        assertThat(relayoutParams.mBorderSettingsId).isNotEqualTo(Resources.ID_NULL);

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_APP_HEADER_WITH_TASK_DENSITY)

    public void updateRelayoutParams_appHeader_usesTaskDensity() {