Merge "Use correct horizontal padding in QS." into main (d248e392) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt

+5 −7

Original line number	Diff line number	Diff line
		@@ -629,11 +629,7 @@ constructor(
		id = R.string.accessibility_quick_settings_expand
		)
		)
		.padding(
		horizontal = {
		QuickSettingsShade.Dimensions.Padding.roundToPx()
		}
		)
		.padding(horizontal = qsHorizontalMargin())
		) {
		QuickQuickSettingsLayout(
		tiles = Tiles,
		@@ -737,8 +733,8 @@ constructor(
		.sysuiResTag(ResIdTags.quickSettingsPanel)
		.padding(
		top = QuickSettingsShade.Dimensions.Padding,
		start = QuickSettingsShade.Dimensions.Padding,
		end = QuickSettingsShade.Dimensions.Padding,
		start = qsHorizontalMargin(),
		end = qsHorizontalMargin(),
		)
		) {
		QuickSettingsLayout(
		@@ -1127,6 +1123,8 @@ private object ResIdTags {
		const val qsFooterActions = "qs_footer_actions"
		}

		@Composable private fun qsHorizontalMargin() = dimensionResource(id = R.dimen.qs_horizontal_margin)

		@Composable
		private fun interactionsConfig() =
		InteractionsConfig(