summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/PagedViewIcon.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-10-25 15:24:24 -0700
committerWinson Chung <winsonc@google.com>2013-10-28 18:30:25 -0700
commit6e1c0d34bb31cacc24c57c89ab01deaa8985814f (patch)
tree71e51b408e5466f1a6ddde1bb5b8d46d420a77b2 /src/com/android/launcher3/PagedViewIcon.java
parent1c6dee72042cb20cd8ce12064305acdade7ebb8a (diff)
downloadandroid_packages_apps_Trebuchet-6e1c0d34bb31cacc24c57c89ab01deaa8985814f.tar.gz
android_packages_apps_Trebuchet-6e1c0d34bb31cacc24c57c89ab01deaa8985814f.tar.bz2
android_packages_apps_Trebuchet-6e1c0d34bb31cacc24c57c89ab01deaa8985814f.zip
Initial changes to support smaller landscape layouts.
Change-Id: If0abe2b82eb08bae4f1ce65b805362d548acb876
Diffstat (limited to 'src/com/android/launcher3/PagedViewIcon.java')
-rw-r--r--src/com/android/launcher3/PagedViewIcon.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedViewIcon.java b/src/com/android/launcher3/PagedViewIcon.java
index 8bfe42d24..865c0b286 100644
--- a/src/com/android/launcher3/PagedViewIcon.java
+++ b/src/com/android/launcher3/PagedViewIcon.java
@@ -62,15 +62,19 @@ public class PagedViewIcon extends TextView {
// Ensure we are using the right text size
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
- setTextSize(TypedValue.COMPLEX_UNIT_SP, grid.iconTextSize);
+ setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);
}
public void applyFromApplicationInfo(AppInfo info, boolean scaleUp,
PagedViewIcon.PressedCallback cb) {
+ LauncherAppState app = LauncherAppState.getInstance();
+ DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+
mIcon = info.iconBitmap;
mPressedCallback = cb;
setCompoundDrawables(null, Utilities.createIconDrawable(mIcon),
null, null);
+ setCompoundDrawablePadding(grid.iconDrawablePaddingPx);
setText(info.title);
setTag(info);
}