commit 74437ffec1e053e5aa6563836c74d7aed47afbc0
author Winson Chung <winsonc@google.com> Tue May 12 01:12:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 12 01:12:09 2015 +0000
tree e0ede5c567d90c3e3e11472b0867d4e0aa766bba
parent e2c01d4e190e6da45f91fa9d963449c4b8831929
parent 44d0aacd5f44623ba87f1c8b3693d74df69d50e5

am 44d0aacd: Fixing issue with font size.

* commit '44d0aacd5f44623ba87f1c8b3693d74df69d50e5':
  Fixing issue with font size.

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 009cc2b..46caf4a 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -100,9 +100,9 @@
         int display = a.getInteger(R.styleable.BubbleTextView_iconDisplay, DISPLAY_WORKSPACE);
         int defaultIconSize = grid.iconSizePx;
         if (display == DISPLAY_WORKSPACE) {
-            setTextSize(grid.iconTextSizePx);
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);
         } else if (display == DISPLAY_ALL_APPS) {
-            setTextSize(grid.allAppsIconTextSizePx);
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx);
             defaultIconSize = grid.allAppsIconSizePx;
         }