Merge "[Flexiglass] Add horizontal paddings to the SingleShade" into main (c6eb2c6d) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -303,6 +303,8 @@ private fun SceneScope.SingleShade(
		viewModel.qsSceneAdapter,
		)
		}
		val shadeHorizontalPadding =
		dimensionResource(id = R.dimen.notification_panel_margin_horizontal)
		val shadeMeasurePolicy =
		remember(mediaInRow) {
		SingleShadeMeasurePolicy(
		@@ -354,6 +356,7 @@ private fun SceneScope.SingleShade(
		Box(
		Modifier.element(QuickSettings.Elements.QuickQuickSettings)
		.layoutId(SingleShadeMeasurePolicy.LayoutId.QuickSettings)
		.padding(horizontal = shadeHorizontalPadding)
		) {
		QuickSettings(
		viewModel.qsSceneAdapter,
		@@ -381,7 +384,9 @@ private fun SceneScope.SingleShade(
		shouldPunchHoleBehindScrim = shouldPunchHoleBehindScrim,
		onEmptySpaceClick =
		viewModel::onEmptySpaceClicked.takeIf { isEmptySpaceClickable },
		modifier = Modifier.layoutId(SingleShadeMeasurePolicy.LayoutId.Notifications),
		modifier =
		Modifier.layoutId(SingleShadeMeasurePolicy.LayoutId.Notifications)
		.padding(horizontal = shadeHorizontalPadding),
		)
		},
		measurePolicy = shadeMeasurePolicy,