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

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

Merge "[Dual Shade] Fix missing padding above the shade on some wide screens." into main

parents 85bb2ef6 0e4e9c6f

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/OverlayShade.kt

+6 −1
Original line number Diff line number Diff line
@@ -150,12 +150,17 @@ private fun Modifier.panelContainerPadding(isFullWidthPanel: Boolean): Modifier 
        return this

    }

    val systemBars = WindowInsets.systemBarsIgnoringVisibility

    // TODO(b/412969642): The systemBars check above reports a top padding of 0 on some devices,

    //  for an unknown reason. This additional check for status bar height specifically is added

    //  here to work around that issue.

    val statusBarHeight = PaddingValues(top = dimensionResource(R.dimen.status_bar_height))

    val displayCutout = WindowInsets.displayCutout

    val waterfall = WindowInsets.waterfall

    val horizontalPadding =

        PaddingValues(horizontal = dimensionResource(id = R.dimen.shade_panel_margin_horizontal))

        PaddingValues(horizontal = dimensionResource(R.dimen.shade_panel_margin_horizontal))

    return padding(

        combinePaddings(

            statusBarHeight,

            systemBars.asPaddingValues(),

            displayCutout.asPaddingValues(),

            waterfall.asPaddingValues(),