commit cdef04403695872db8be6342b8dacd437ee02d52
author Winson Chung <winsonc@google.com> Thu Sep 19 17:32:58 2013 -0700
committer Winson Chung <winsonc@google.com> Thu Sep 19 18:07:05 2013 -0700
tree d9f62bc88cfd30ec2c9a1c5de3540b3026aaa77a
parent bb701aaa83889b208ba8910e08023c84693138d1

Fixing some grid spacing issues. (Bug 10754537, 10754538)

- Ensuring app names don't run into each other in folders and on the workspace
- Ensuring that app names are aligned with folder names

Change-Id: Ie8d546eacd52005778d81c46011c1c84bc24118c

src/com/android/launcher3/DynamicGrid.java

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 70f0000..6e10175 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -207,7 +207,7 @@
 
         // Folder
         folderCellWidthPx = cellWidthPx + 3 * edgeMarginPx;
-        folderCellHeightPx = cellHeightPx + edgeMarginPx;
+        folderCellHeightPx = cellHeightPx + (int) ((3f/2f) * edgeMarginPx);
         folderBackgroundOffset = -edgeMarginPx;
         folderIconSizePx = iconSizePx + 2 * -folderBackgroundOffset;
     }