commit 79b4194765c5cea13aae6064099735d147ad8efc
author Tony Wickham <twickham@google.com> Thu Nov 12 23:41:06 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 12 23:41:06 2015 +0000
tree f92b1cf7edba17af8ba4c5145532e50a8060ab04
parent 9e163059bba6f6b7424e10b35db3886694ab4bd8
parent b25e684a766362422f5693f7a2189910c1275584

Reverting folder cell width on portrait phones.
am: b25e684a76

* commit 'b25e684a766362422f5693f7a2189910c1275584':
  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;