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

Commit 734e6bde authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Fix status bar height used by dual shade 

The status bar height for the dual shade now aligns with other system UI elements by using SystemBarUtils.getStatusBarHeight. This corrects rendering issues on external displays.

Bug: 362719719
Bug: 417960167
Flag: com.android.systemui.shade_window_goes_around
Test: open shade on default display -> move to external display -> observe status bar height is correct
Change-Id: Ib1c8e9d2d483b37d490c195ca2c86c263affa019
parent b26d2514

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

+7 −4
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import androidx.compose.ui.layout.positionInWindow 
import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.platform.LocalLayoutDirection

import androidx.compose.ui.res.dimensionResource

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.unit.Constraints

import androidx.compose.ui.unit.Dp
@@ -80,6 +79,7 @@ import com.android.compose.animation.scene.animateElementFloatAsState 
import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.thenIf

import com.android.compose.theme.colorAttr

import com.android.internal.policy.SystemBarUtils

import com.android.settingslib.Utils

import com.android.systemui.battery.BatteryMeterView

import com.android.systemui.battery.BatteryMeterViewController
@@ -137,9 +137,12 @@ object ShadeHeader { 
        val ChipPaddingVertical = 4.dp



        val StatusBarHeight: Dp

            // TODO(b/414737230): This is a temporary workaround, until we fix the zero padding

            //  issue given by WindowInsets.statusBars.asPaddingValues().calculateTopPadding().

            @Composable get() = dimensionResource(R.dimen.status_bar_height)

            @Composable

            get() {

                return with(LocalDensity.current) {

                    SystemBarUtils.getStatusBarHeight(LocalContext.current).toDp()

                }

            }

    }



    object TestTags {