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/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index bb6903d..7a7a3b6 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -102,10 +102,13 @@
 
     public void applyFromShortcutInfo(ShortcutInfo info, IconCache iconCache) {
         Bitmap b = info.getIcon(iconCache);
+        LauncherAppState app = LauncherAppState.getInstance();
+        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
 
         setCompoundDrawablesWithIntrinsicBounds(null,
                 new FastBitmapDrawable(b),
                 null, null);
+        setCompoundDrawablePadding((int) ((grid.folderIconSizePx - grid.iconSizePx) / 2f));
         setText(info.title);
         setTag(info);
     }