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

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

Enable box shadows and border settings appropriately 

Bug: 253168053
Test: Open a freeform window and ensure box shadows and borders are being drawn
Flag: com.android.wm.shell.enable_pip_box_shadows
Change-Id: I99ba5b249526ebdff2bf6ee852cbb8d2e15a8825
parent 5828e7e6

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DefaultWindowDecoration.kt

+9 −4
Original line number Diff line number Diff line
@@ -522,8 +522,9 @@ constructor( 
        hasGlobalFocus: Boolean,

    ): Int =

        if (

            !DesktopExperienceFlags.ENABLE_FREEFORM_BOX_SHADOWS.isTrue ||

                captionType != CaptionController.CaptionType.APP_HEADER ||

                desktopConfig.useWindowShadow(isFocusedWindow = hasGlobalFocus)

                !desktopConfig.useWindowShadow(isFocusedWindow = hasGlobalFocus)

        ) {

            ID_NULL

        } else if (DecorThemeUtil(context).getAppTheme(taskInfo) == Theme.DARK) {
@@ -541,7 +542,9 @@ constructor( 
        captionType: CaptionController.CaptionType,

        hasGlobalFocus: Boolean,

    ): Int =

        if (

        if (DesktopExperienceFlags.ENABLE_FREEFORM_BOX_SHADOWS.isTrue) {

            ID_NULL

        } else if (

            !DesktopExperienceFlags.ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX.isTrue ||

                captionType != CaptionController.CaptionType.APP_HEADER ||

                !desktopConfig.useWindowShadow(isFocusedWindow = hasGlobalFocus)
@@ -558,7 +561,9 @@ constructor( 
        captionType: CaptionController.CaptionType,

        hasGlobalFocus: Boolean,

    ): Int =

        if (

        if (DesktopExperienceFlags.ENABLE_FREEFORM_BOX_SHADOWS.isTrue) {

            INVALID_SHADOW_RADIUS

        } else if (

            DesktopExperienceFlags.ENABLE_DYNAMIC_RADIUS_COMPUTATION_BUGFIX.isTrue ||

                captionType != CaptionController.CaptionType.APP_HEADER ||

                !desktopConfig.useWindowShadow(isFocusedWindow = hasGlobalFocus)