summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabián Kozynski <kozynski@google.com> 2024-11-22 15:22:57 -0500
committer Fabián Kozynski <kozynski@google.com> 2024-11-22 15:26:47 -0500
commita3dd66ff076bb23985398fbf533bbbbcc2aefa6d (patch)
tree7f48abe4eaf5fb5a7b456d86ce2a463b1034e5fb
parentfeb3f74a74a6f0ec87511682e14addab00909ee5 (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt12
1 files 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(