Merge "Controls spacing" into sc-dev am: 68db245507

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919750

Change-Id: Ia7b92cf9759fed0fd936449e15b34575705e66e4
This commit is contained in:
Matt Pietal
2021-06-09 18:46:09 +00:00
committed by Automerger Merge Worker

View File

@@ -422,8 +422,12 @@ class ControlsUiControllerImpl @Inject constructor (
// add spacers if necessary to keep control size consistent // add spacers if necessary to keep control size consistent
val mod = selectedStructure.controls.size % maxColumns val mod = selectedStructure.controls.size % maxColumns
var spacersToAdd = if (mod == 0) 0 else maxColumns - mod var spacersToAdd = if (mod == 0) 0 else maxColumns - mod
val margin = context.resources.getDimensionPixelSize(R.dimen.control_spacing)
while (spacersToAdd > 0) { 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-- spacersToAdd--
} }
} }