From b8daba75e7c45c6c853e7c3cd2823649517e6415 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Wed, 9 Jun 2021 08:46:37 -0400 Subject: [PATCH] Controls spacing The last row may contain spacers, but these also need the correct margins so all controls retain the same dimensions. Fixes: 190089614 Test: manual (controls main activity + add/edit controls) Change-Id: Ie19b98405213bc0f9ef53a11f44cb8013139e562 --- .../systemui/controls/ui/ControlsUiControllerImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt index af7089296bca5..567d0cb3e6cbf 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt @@ -422,8 +422,12 @@ class ControlsUiControllerImpl @Inject constructor ( // add spacers if necessary to keep control size consistent val mod = selectedStructure.controls.size % maxColumns var spacersToAdd = if (mod == 0) 0 else maxColumns - mod + val margin = context.resources.getDimensionPixelSize(R.dimen.control_spacing) while (spacersToAdd > 0) { - lastRow.addView(Space(context), LinearLayout.LayoutParams(0, 0, 1f)) + val lp = LinearLayout.LayoutParams(0, 0, 1f).apply { + setMarginStart(margin) + } + lastRow.addView(Space(context), lp) spacersToAdd-- } }