commit be424b2c32a878608411bc0748bc88300046cc27
author Tony Wickham <twickham@google.com> Mon Oct 12 23:25:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 12 23:25:24 2015 +0000
tree 377c7a565bd7e4816c64b4d4476ac92dd8a52473
parent e906643c70ea73e3e506dd260a8ccc71c7c357bb
parent a295048a69d35b5adc3f021c3d40c32700cc9629

am a295048a: Increase folder cell width slightly.

* commit 'a295048a69d35b5adc3f021c3d40c32700cc9629':
  Increase folder cell width slightly.

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 4a489de..4ee8a51 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -229,7 +229,8 @@
         hotseatCellHeightPx = iconSizePx;
 
         // Folder
-        folderCellWidthPx = cellWidthPx + 3 * edgeMarginPx;
+        folderCellWidthPx = Math.min(cellWidthPx + 6 * edgeMarginPx,
+                (availableWidthPx - 4 * edgeMarginPx) / inv.numFolderColumns);
         folderCellHeightPx = cellHeightPx + edgeMarginPx;
         folderBackgroundOffset = -edgeMarginPx;
         folderIconSizePx = iconSizePx + 2 * -folderBackgroundOffset;