diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-06-15 12:26:54 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-06-15 12:26:54 -0700 |
commit | 41e3369d5fffb2e8dfa33bfcb14386ad339b0f2f (patch) | |
tree | a738025952bf902827d04f9ad189e24e15cf0acd /src/com/android/launcher3/WidgetPreviewLoader.java | |
parent | 90429e11e75f5756d250f1156cac7cc6479f90a1 (diff) | |
download | android_packages_apps_Trebuchet-41e3369d5fffb2e8dfa33bfcb14386ad339b0f2f.tar.gz android_packages_apps_Trebuchet-41e3369d5fffb2e8dfa33bfcb14386ad339b0f2f.tar.bz2 android_packages_apps_Trebuchet-41e3369d5fffb2e8dfa33bfcb14386ad339b0f2f.zip |
Work profile badge alignment
b/21336417
Change-Id: Icd54320fa0d0976cac0ae66d180cc2c99ddd0c1c
Diffstat (limited to 'src/com/android/launcher3/WidgetPreviewLoader.java')
-rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index cfeced2df..75952d1a6 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -64,7 +64,7 @@ public class WidgetPreviewLoader { private final UserManagerCompat mUserManager; private final AppWidgetManagerCompat mManager; private final CacheDb mDb; - private final InvariantDeviceProfile mDeviceProfile; + private final int mProfileBadgeMargin; private final MainThreadExecutor mMainThreadExecutor = new MainThreadExecutor(); @Thunk final Handler mWorkerHandler; @@ -76,7 +76,8 @@ public class WidgetPreviewLoader { mUserManager = UserManagerCompat.getInstance(context); mDb = new CacheDb(context); mWorkerHandler = new Handler(LauncherModel.getWorkerLooper()); - mDeviceProfile = inv; + mProfileBadgeMargin = context.getResources() + .getDimensionPixelSize(R.dimen.profile_badge_margin); } /** @@ -401,7 +402,7 @@ public class WidgetPreviewLoader { } // Draw the scaled preview into the final bitmap - int x = (preview.getWidth() - previewWidth) / 2; + int x = (preview.getWidth() - previewWidth - mProfileBadgeMargin) / 2; if (widgetPreviewExists) { drawable.setBounds(x, 0, x + previewWidth, previewHeight); drawable.draw(c); @@ -445,7 +446,8 @@ public class WidgetPreviewLoader { } catch (Resources.NotFoundException e) { } c.setBitmap(null); } - return mManager.getBadgeBitmap(info, preview, Math.min(preview.getHeight(), previewHeight)); + int imageHeight = Math.min(preview.getHeight(), previewHeight + mProfileBadgeMargin); + return mManager.getBadgeBitmap(info, preview, imageHeight); } private Bitmap generateShortcutPreview( |