Merge "Fix calculation of empty spaces" into rvc-dev am: 6813206e6c

Change-Id: Idb455cf7908c0ddd3fbdb07e4014c011c0a5ac35
2020-04-09 21:26:48 +00:00
parent ec733dcca7 6813206e6c
commit 2248146de8
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
@@ -429,7 +429,8 @@ class ControlsUiControllerImpl @Inject constructor (
        }

        // add spacers if necessary to keep control size consistent
-        var spacersToAdd = maxColumns - (selectedStructure.controls.size % maxColumns)
+        val mod = selectedStructure.controls.size % maxColumns
+        var spacersToAdd = if (mod == 0) 0 else maxColumns - mod
        while (spacersToAdd > 0) {
            lastRow.addView(Space(context), LinearLayout.LayoutParams(0, 0, 1f))
            spacersToAdd--