From a3dd66ff076bb23985398fbf533bbbbcc2aefa6d Mon Sep 17 00:00:00 2001 From: Fabián Kozynski Date: Fri, 22 Nov 2024 15:22:57 -0500 Subject: Use correct horizontal padding in QS. This matches the margins set in QSContainerImpl Test: manual, tablet Test: atest MediaHorizontalBounds Flag: com.android.systemui.qs_ui_refactor_compose_fragment Fixes: 378137721 Change-Id: Ic76fb86fb398faac084d72f38c25046bf2cd21ea --- .../android/systemui/qs/composefragment/QSFragmentCompose.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt index 21c45c550e08..25937fae2916 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt @@ -628,11 +628,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( @@ -1098,6 +1094,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( -- cgit v1.2.3-59-g8ed1b