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

Commit 062a744e authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

[Flexiglass] Fix padding in QQS 

Fixes padding under QQS and under UMO in ShadeScene.

Test: manual
Fixes: 429109326
Flag: com.android.systemui.scene_container
Change-Id: I14228c92578913e0c92efa8039847fc10f919e43
parent 9d832146

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ import androidx.compose.ui.platform.LocalDensity 
import androidx.compose.ui.platform.LocalResources

import androidx.compose.ui.platform.LocalResources

import androidx.compose.ui.res.colorResource

import androidx.compose.ui.res.colorResource

import androidx.compose.ui.res.dimensionResource

import androidx.compose.ui.res.dimensionResource

import androidx.compose.ui.unit.IntOffset

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.dp

import androidx.compose.ui.zIndex

import androidx.compose.ui.zIndex

import androidx.lifecycle.compose.LocalLifecycleOwner

import androidx.lifecycle.compose.LocalLifecycleOwner
@@ -279,10 +280,10 @@ private fun ContentScope.SingleShade( 
    val navBarHeight = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()

    val navBarHeight = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()





    val mediaOffsetProvider = remember {

    val mediaOffsetProvider = remember {

        ShadeMediaOffsetProvider.Qqs(

        object : ShadeMediaOffsetProvider {

            { @Suppress("UNUSED_EXPRESSION") tileSquishiness },

            override val offset: IntOffset

            viewModel.qsSceneAdapter,

                get() = IntOffset.Zero

        )

        }

    }

    }

    val shadeHorizontalPadding =

    val shadeHorizontalPadding =

        dimensionResource(id = R.dimen.notification_panel_margin_horizontal)

        dimensionResource(id = R.dimen.notification_panel_margin_horizontal)
@@ -325,6 +326,8 @@ private fun ContentScope.SingleShade( 
                    modifier = Modifier.layoutId(SingleShadeMeasurePolicy.LayoutId.ShadeHeader),

                    modifier = Modifier.layoutId(SingleShadeMeasurePolicy.LayoutId.ShadeHeader),

                )

                )





                val qqsLayoutPaddingBottom = 16.dp



                Box(

                Box(

                    Modifier.element(QuickSettings.Elements.QuickQuickSettings)

                    Modifier.element(QuickSettings.Elements.QuickQuickSettings)

                        .layoutId(SingleShadeMeasurePolicy.LayoutId.QuickSettings)

                        .layoutId(SingleShadeMeasurePolicy.LayoutId.QuickSettings)
@@ -333,6 +336,7 @@ private fun ContentScope.SingleShade( 
                                shadeHorizontalPadding +

                                shadeHorizontalPadding +

                                    dimensionResource(id = R.dimen.qs_horizontal_margin)

                                    dimensionResource(id = R.dimen.qs_horizontal_margin)

                        )

                        )

                        .padding(bottom = qqsLayoutPaddingBottom)

                ) {

                ) {

                    val qqsViewModel =

                    val qqsViewModel =

                        rememberViewModel(traceName = "shade_scene_qqs") {

                        rememberViewModel(traceName = "shade_scene_qqs") {
@@ -345,8 +349,6 @@ private fun ContentScope.SingleShade( 
                    )

                    )

                }

                }





                val qqsLayoutPaddingBottom =

                    dimensionResource(id = R.dimen.qqs_layout_padding_bottom)

                ShadeMediaCarousel(

                ShadeMediaCarousel(

                    isVisible = viewModel.isMediaVisible,

                    isVisible = viewModel.isMediaVisible,

                    isInRow = mediaInRow,

                    isInRow = mediaInRow,
@@ -360,9 +362,7 @@ private fun ContentScope.SingleShade( 
                                    shadeHorizontalPadding +

                                    shadeHorizontalPadding +

                                        dimensionResource(id = R.dimen.qs_horizontal_margin)

                                        dimensionResource(id = R.dimen.qs_horizontal_margin)

                            )

                            )

                            .thenIf(!mediaInRow) {

                            .padding(bottom = qqsLayoutPaddingBottom),

                                Modifier.padding(bottom = qqsLayoutPaddingBottom)

                            },

                    usingCollapsedLandscapeMedia = usingCollapsedLandscapeMedia,

                    usingCollapsedLandscapeMedia = usingCollapsedLandscapeMedia,

                    isQsEnabled = viewModel.isQsEnabled,

                    isQsEnabled = viewModel.isQsEnabled,

                    isInSplitShade = false,

                    isInSplitShade = false,