diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-10 17:52:01 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-10 17:52:01 -0800 |
| commit | 258797318a99eb1ad4019f9863c69e34ef47a1ff (patch) | |
| tree | e30e0905d16880d946c6ffac20cd8246adc82fe5 /src/com/android/launcher3/BubbleTextView.java | |
| parent | aefc0c4dd0589d2ef423caf26c11068b5cb59722 (diff) | |
| parent | 49750ce75e7413ad3c4fe4be31a2e1d73312794b (diff) | |
| download | android_packages_apps_Trebuchet-258797318a99eb1ad4019f9863c69e34ef47a1ff.tar.gz android_packages_apps_Trebuchet-258797318a99eb1ad4019f9863c69e34ef47a1ff.tar.bz2 android_packages_apps_Trebuchet-258797318a99eb1ad4019f9863c69e34ef47a1ff.zip | |
Merge "Fixing All apps not respecting scaled icon size" into ub-launcher3-burnaby-polish
am: 49750ce75e
* commit '49750ce75e7413ad3c4fe4be31a2e1d73312794b':
Fixing All apps not respecting scaled icon size
Diffstat (limited to 'src/com/android/launcher3/BubbleTextView.java')
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index a3b92dcf7..ce7e39252 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -113,7 +113,7 @@ public class BubbleTextView extends TextView if (display == DISPLAY_WORKSPACE) { setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx); } else if (display == DISPLAY_ALL_APPS) { - setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx); + setTextSize(TypedValue.COMPLEX_UNIT_SP, grid.allAppsIconTextSizeSp); defaultIconSize = grid.allAppsIconSizePx; } |