commit ec3723beb1f02ad665c6c8f030eebe81cf1daf33
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 24 17:31:13 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 24 17:31:13 2022 +0000
tree 35146dfcbaa11410dd4e14e962287aafb8a9e88f
parent 6a4ea4c849d0eb87dd05266d2e88c8b8c5a617a5
parent 4f3cf5d05fe40b5805c69aac28161b491fcee055

Merge "Fix widget span" into tm-dev

src/com/android/launcher3/widget/BaseWidgetSheet.java

diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java
index 1bcba14..8962c4f 100644
--- a/src/com/android/launcher3/widget/BaseWidgetSheet.java
+++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java
@@ -198,7 +198,9 @@
     /** 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;