Merge "Don't make label textures if we don't need them."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index af66610..ebcdea5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.launcher2"
>
-
+
+ <original-package android:name="com.android.launcher2" />
+
<permission
android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher2/Utilities.java
index 93ff97a..fbe489e 100644
--- a/src/com/android/launcher2/Utilities.java
+++ b/src/com/android/launcher2/Utilities.java
@@ -260,7 +260,7 @@
RectF bubbleRect = mBubbleRect;
bubbleRect.left = 0;
bubbleRect.top = 0;
- bubbleRect.right = (int)(bubbleWidth+0.5f);
+ bubbleRect.right = (int) cellWidth;
mTextWidth = bubbleWidth - mBubblePadding - mBubblePadding;