diff options
author | Jonathan Miranda <jonmiranda@google.com> | 2017-07-18 19:41:30 +0000 |
---|---|---|
committer | Jonathan Miranda <jonmiranda@google.com> | 2017-07-18 19:41:30 +0000 |
commit | d39707b662602659a929071458bd0a233ec6a0cd (patch) | |
tree | cd3695820324cc7a5f70df65e4580211ef9c64e3 /src/com/android | |
parent | 21ae7d7cbe2dd83c3db75e010c37c40e7b8e082e (diff) | |
parent | 8632d9dd1e69ecdaa6c16fdcb990ce9a85f3f67c (diff) | |
download | android_packages_apps_Trebuchet-d39707b662602659a929071458bd0a233ec6a0cd.tar.gz android_packages_apps_Trebuchet-d39707b662602659a929071458bd0a233ec6a0cd.tar.bz2 android_packages_apps_Trebuchet-d39707b662602659a929071458bd0a233ec6a0cd.zip |
Factor in CellLayout padding in cell size calculation. am: 8632d9dd1e
Change-Id: I5cf4a8b9ad63ce87efa88708cb4a99439497326c
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index ca5d8e746..2d5f8d016 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -436,7 +436,8 @@ public class DeviceProfile { // 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; } |