diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-05-15 00:09:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 00:09:49 +0000 |
commit | e3a1df20e6aa68175109c0bceb8cbf4b7fe80978 (patch) | |
tree | dfe77458c8a43f93e3c1cf0bc7d7f00b2a1df468 /src/com/android/launcher3/compat | |
parent | f7e85f85d373103e45c9a54df0827efe94417031 (diff) | |
parent | 6babf2e27e6260f02751413b8f7a55e46659af27 (diff) | |
download | android_packages_apps_Trebuchet-e3a1df20e6aa68175109c0bceb8cbf4b7fe80978.tar.gz android_packages_apps_Trebuchet-e3a1df20e6aa68175109c0bceb8cbf4b7fe80978.tar.bz2 android_packages_apps_Trebuchet-e3a1df20e6aa68175109c0bceb8cbf4b7fe80978.zip |
Merge "Place the work profile badge in the correct bottom right (left for RTL) location" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/compat')
3 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java index e41a66fb4..7aa36d447 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java @@ -78,6 +78,7 @@ public abstract class AppWidgetManagerCompat { public abstract Drawable loadIcon(LauncherAppWidgetProviderInfo info, IconCache cache); - public abstract Bitmap getBadgeBitmap(LauncherAppWidgetProviderInfo info, Bitmap bitmap); + public abstract Bitmap getBadgeBitmap(LauncherAppWidgetProviderInfo info, Bitmap bitmap, + int imageHeight); } diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatV16.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatV16.java index 8cecb9602..a64c70535 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompatV16.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatV16.java @@ -87,7 +87,7 @@ class AppWidgetManagerCompatV16 extends AppWidgetManagerCompat { } @Override - public Bitmap getBadgeBitmap(LauncherAppWidgetProviderInfo info, Bitmap bitmap) { + public Bitmap getBadgeBitmap(LauncherAppWidgetProviderInfo info, Bitmap bitmap, int imageHeight) { return bitmap; } } diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java index 6c3e092e8..96ace8477 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java @@ -108,7 +108,7 @@ class AppWidgetManagerCompatVL extends AppWidgetManagerCompat { } @Override - public Bitmap getBadgeBitmap(LauncherAppWidgetProviderInfo info, Bitmap bitmap) { + public Bitmap getBadgeBitmap(LauncherAppWidgetProviderInfo info, Bitmap bitmap, int imageHeight) { if (info.isCustomWidget || info.getProfile().equals(android.os.Process.myUserHandle())) { return bitmap; } @@ -117,9 +117,10 @@ class AppWidgetManagerCompatVL extends AppWidgetManagerCompat { final Resources res = mContext.getResources(); final int badgeSize = res.getDimensionPixelSize(R.dimen.profile_badge_size); final int badgeMargin = res.getDimensionPixelSize(R.dimen.profile_badge_margin); + final int badgeMinTop = res.getDimensionPixelSize(R.dimen.profile_badge_minimum_top); final Rect badgeLocation = new Rect(0, 0, badgeSize, badgeSize); - final int top = bitmap.getHeight() - badgeSize - badgeMargin; + final int top = Math.max(imageHeight - badgeSize - badgeMargin, badgeMinTop); if (res.getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { badgeLocation.offset(badgeMargin, top); } else { |