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

Commit 3d73a909 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[WindowDecor2] Fix logic for setting spy/force-consumption params" into main

parents 75f09860 ab2878df

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

+6 −7
Original line number Original line Diff line number Diff line
@@ -429,13 +429,12 @@ constructor( 
        var insetSourceFlags = 0

        var insetSourceFlags = 0

        var shouldSetAppBounds = false

        var shouldSetAppBounds = false

        if (isAppHeader) {

        if (isAppHeader) {

            if (

            if (taskInfo.isTransparentCaptionBarAppearance) {

                taskInfo.isTransparentCaptionBarAppearance &&

                if (!DesktopModeFlags.ENABLE_ACCESSIBLE_CUSTOM_HEADERS.isTrue) {

                    !DesktopModeFlags.ENABLE_ACCESSIBLE_CUSTOM_HEADERS.isTrue

            ) {

                    // Allow input to fall through to the windows below so that the app can respond

                    // Allow input to fall through to the windows below so that the app can respond

                    // to input events on their custom content.

                    // to input events on their custom content.

                    inputFeatures = inputFeatures or WindowManager.LayoutParams.INPUT_FEATURE_SPY

                    inputFeatures = inputFeatures or WindowManager.LayoutParams.INPUT_FEATURE_SPY

                }

            } else if (DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION.isTrue) {

            } else if (DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION.isTrue) {

                if (shouldExcludeCaptionFromAppBounds) {

                if (shouldExcludeCaptionFromAppBounds) {

                    shouldSetAppBounds = true

                    shouldSetAppBounds = true