commit 5be36b49418504426c74da208d0f87898d993c51
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 19 20:25:57 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 19 20:25:57 2017 +0000
tree f61681dc6c56cff06f127d44e1075d6d2d0924e6
parent 5360b6ee4f3016f38e244607c9ddb835bdfdf2fb
parent 8632d9dd1e69ecdaa6c16fdcb990ce9a85f3f67c

Merge "Factor in CellLayout padding in cell size calculation." into ub-launcher3-dorval-polish

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index ca5d8e7..2d5f8d0 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -436,7 +436,8 @@
         // Since we are only concerned with the overall padding, layout direction does
         // not matter.
         Point padding = getTotalWorkspacePadding();
-        result.x = calculateCellWidth(availableWidthPx - padding.x, inv.numColumns);
+        int cellPadding = cellLayoutPaddingLeftRightPx * 2;
+        result.x = calculateCellWidth(availableWidthPx - padding.x - cellPadding, inv.numColumns);
         result.y = calculateCellHeight(availableHeightPx - padding.y, inv.numRows);
         return result;
     }