Merge "[Flexiglass] Fix padding in QQS" into main (a772c750) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	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.res.colorResource
		import androidx.compose.ui.res.dimensionResource
		import androidx.compose.ui.unit.IntOffset
		import androidx.compose.ui.unit.dp
		import androidx.compose.ui.zIndex
		import androidx.lifecycle.compose.LocalLifecycleOwner
		@@ -279,10 +280,10 @@ private fun ContentScope.SingleShade(
		val navBarHeight = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()

		val mediaOffsetProvider = remember {
		ShadeMediaOffsetProvider.Qqs(
		{ @Suppress("UNUSED_EXPRESSION") tileSquishiness },
		viewModel.qsSceneAdapter,
		)
		object : ShadeMediaOffsetProvider {
		override val offset: IntOffset
		get() = IntOffset.Zero
		}
		}
		val shadeHorizontalPadding =
		dimensionResource(id = R.dimen.notification_panel_margin_horizontal)
		@@ -325,6 +326,8 @@ private fun ContentScope.SingleShade(
		modifier = Modifier.layoutId(SingleShadeMeasurePolicy.LayoutId.ShadeHeader),
		)

		val qqsLayoutPaddingBottom = 16.dp

		Box(
		Modifier.element(QuickSettings.Elements.QuickQuickSettings)
		.layoutId(SingleShadeMeasurePolicy.LayoutId.QuickSettings)
		@@ -333,6 +336,7 @@ private fun ContentScope.SingleShade(
		shadeHorizontalPadding +
		dimensionResource(id = R.dimen.qs_horizontal_margin)
		)
		.padding(bottom = qqsLayoutPaddingBottom)
		) {
		val qqsViewModel =
		rememberViewModel(traceName = "shade_scene_qqs") {
		@@ -345,8 +349,6 @@ private fun ContentScope.SingleShade(
		)
		}

		val qqsLayoutPaddingBottom =
		dimensionResource(id = R.dimen.qqs_layout_padding_bottom)
		ShadeMediaCarousel(
		isVisible = viewModel.isMediaVisible,
		isInRow = mediaInRow,
		@@ -360,9 +362,7 @@ private fun ContentScope.SingleShade(
		shadeHorizontalPadding +
		dimensionResource(id = R.dimen.qs_horizontal_margin)
		)
		.thenIf(!mediaInRow) {
		Modifier.padding(bottom = qqsLayoutPaddingBottom)
		},
		.padding(bottom = qqsLayoutPaddingBottom),
		usingCollapsedLandscapeMedia = usingCollapsedLandscapeMedia,
		isQsEnabled = viewModel.isQsEnabled,
		isInSplitShade = false,