diff options
author | Adam Cohen <adamcohen@google.com> | 2014-12-06 00:22:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-06 00:22:43 +0000 |
commit | 30914ad14d16cfdc731b044ecd6d881fb0d44fd5 (patch) | |
tree | 8e0daad1ed10d79c8af4c5ed0b4b523a871a5894 /src/com/android/launcher3/WidgetPreviewLoader.java | |
parent | 396628876da3df23ecc545ca474da8fe8e3a2cb8 (diff) | |
parent | 5940042d39b576553c2499bcf3d0641281e6ad52 (diff) | |
download | android_packages_apps_Trebuchet-30914ad14d16cfdc731b044ecd6d881fb0d44fd5.tar.gz android_packages_apps_Trebuchet-30914ad14d16cfdc731b044ecd6d881fb0d44fd5.tar.bz2 android_packages_apps_Trebuchet-30914ad14d16cfdc731b044ecd6d881fb0d44fd5.zip |
Merge "Supporting custom widgets provided by launcher" into ub-now-master
Diffstat (limited to 'src/com/android/launcher3/WidgetPreviewLoader.java')
-rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 4e6fe1f88..d963f2db9 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -344,7 +344,6 @@ public class WidgetPreviewLoader { sb.setLength(0); } else { sb.append(SHORTCUT_PREFIX); - ResolveInfo info = (ResolveInfo) o; sb.append(new ComponentName(info.activityInfo.packageName, info.activityInfo.name).flattenToString()); @@ -490,20 +489,19 @@ public class WidgetPreviewLoader { preview.getHeight() != mPreviewBitmapHeight)) { throw new RuntimeException("Improperly sized bitmap passed as argument"); } - if (info instanceof AppWidgetProviderInfo) { - return generateWidgetPreview((AppWidgetProviderInfo) info, preview); + if (info instanceof LauncherAppWidgetProviderInfo) { + return generateWidgetPreview((LauncherAppWidgetProviderInfo) info, preview); } else { return generateShortcutPreview( (ResolveInfo) info, mPreviewBitmapWidth, mPreviewBitmapHeight, preview); } } - public Bitmap generateWidgetPreview(AppWidgetProviderInfo info, Bitmap preview) { - int[] cellSpans = Launcher.getSpanForWidget(mContext, info); - int maxWidth = maxWidthForWidgetPreview(cellSpans[0]); - int maxHeight = maxHeightForWidgetPreview(cellSpans[1]); - return generateWidgetPreview(info, cellSpans[0], cellSpans[1], - maxWidth, maxHeight, preview, null); + public Bitmap generateWidgetPreview(LauncherAppWidgetProviderInfo info, Bitmap preview) { + int maxWidth = maxWidthForWidgetPreview(info.spanX); + int maxHeight = maxHeightForWidgetPreview(info.spanY); + return generateWidgetPreview(info, info.spanX, info.spanY, maxWidth, + maxHeight, preview, null); } public int maxWidthForWidgetPreview(int spanX) { @@ -516,7 +514,7 @@ public class WidgetPreviewLoader { mWidgetSpacingLayout.estimateCellHeight(spanY)); } - public Bitmap generateWidgetPreview(AppWidgetProviderInfo info, int cellHSpan, int cellVSpan, + public Bitmap generateWidgetPreview(LauncherAppWidgetProviderInfo info, int cellHSpan, int cellVSpan, int maxPreviewWidth, int maxPreviewHeight, Bitmap preview, int[] preScaledWidthOut) { // Load the preview image if possible if (maxPreviewWidth < 0) maxPreviewWidth = Integer.MAX_VALUE; |