Merge "Fix calculation of empty spaces" into rvc-dev

2020-04-09 21:04:18 +00:00
parent a0caf8fad9 1ffaf8c28e
commit 6813206e6c
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--