Merge "Fix widget span" into tm-dev

2022-05-24 17:31:13 +00:00
parent 6a4ea4c849 4f3cf5d05f
commit ec3723beb1
1 changed files with 3 additions and 1 deletions
@@ -198,7 +198,9 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
    /** Returns the number of cells that can fit horizontally in a given {@code content}. */
    protected int computeMaxHorizontalSpans(View content, int contentHorizontalPaddingPx) {
        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
-        int availableWidth = content.getMeasuredWidth() - contentHorizontalPaddingPx;
+        int availableWidth = content.getMeasuredWidth()
+                - contentHorizontalPaddingPx
+                - (2 * mContentHorizontalMarginInPx);
        Point cellSize = deviceProfile.getCellSize();
        if (cellSize.x > 0) {
            return availableWidth / cellSize.x;