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

Commit fdd18dcd authored by Cairn Overturf's avatar Cairn Overturf Committed by Android (Google) Code Review
Browse files

Merge "Enable box shadows and border settings appropriately" into main

parents 7102e186 eff3c604

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

+9 −4
Original line number Diff line number Diff line
@@ -525,8 +525,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) {
@@ -544,7 +545,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)
@@ -561,7 +564,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)