commit 0309fbc65ff99285e67cf3f6ec025a656977e86e
author Tony Wickham <twickham@google.com> Thu Nov 12 23:52:34 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 12 23:52:34 2015 +0000
tree 2794e3a95bf865bdeb7a2052ec3adf29262cd4e4
parent 79b4194765c5cea13aae6064099735d147ad8efc
parent 1974e98f5ec4713e50ba64ec32a7607c92ddce9b

Revert "Reverting folder cell width on portrait phones."
am: 1974e98f5e

* commit '1974e98f5ec4713e50ba64ec32a7607c92ddce9b':
  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 5032dcf..d2ca8f6 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -245,9 +245,7 @@
         hotseatCellHeightPx = iconSizePx;
 
         // Folder
-        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,
+        folderCellWidthPx = Math.min(cellWidthPx + 6 * edgeMarginPx,
                 (availableWidthPx - 4 * edgeMarginPx) / inv.numFolderColumns);
         folderCellHeightPx = cellHeightPx + edgeMarginPx;
         folderBackgroundOffset = -edgeMarginPx;