commit ec73dd97f08e243dbd94b699a2303fd1c9fe7c05
author Tony Wickham <twickham@google.com> Fri Nov 13 18:10:57 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 13 18:10:57 2015 +0000
tree f92b1cf7edba17af8ba4c5145532e50a8060ab04
parent 0309fbc65ff99285e67cf3f6ec025a656977e86e
parent 6159c242bc610f13e4c7550ae8b15f25603f4b23

Revert "Revert "Reverting folder cell width on portrait phones.""
am: 6159c242bc

* commit '6159c242bc610f13e4c7550ae8b15f25603f4b23':
  Revert "Revert "Reverting folder cell width on portrait phones.""

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index d2ca8f6..5032dcf 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -245,7 +245,9 @@
         hotseatCellHeightPx = iconSizePx;
 
         // Folder
-        folderCellWidthPx = Math.min(cellWidthPx + 6 * edgeMarginPx,
+        int folderCellPadding = isTablet || isLandscape ? 6 * edgeMarginPx : 3 * edgeMarginPx;
+        // Don't let the folder get too close to the edges of the screen.
+        folderCellWidthPx = Math.min(cellWidthPx + folderCellPadding,
                 (availableWidthPx - 4 * edgeMarginPx) / inv.numFolderColumns);
         folderCellHeightPx = cellHeightPx + edgeMarginPx;
         folderBackgroundOffset = -edgeMarginPx;