diff options
| -rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetCell.java | 11 | ||||
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsListAdapter.java | 9 |
3 files changed, 8 insertions, 14 deletions
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index fe09fb6aa..8459673b1 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -88,7 +88,7 @@ public class WidgetPreviewLoader { * @return a request id which can be used to cancel the request. */ public PreviewLoadRequest getPreview(final Object o, int previewWidth, int previewHeight, - WidgetCell caller, Bitmap[] immediateResult) { + WidgetCell caller) { String size = previewWidth + "x" + previewHeight; WidgetCacheKey key = getObjectKey(o, size); diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java index aade85fb2..a34e71607 100644 --- a/src/com/android/launcher3/widget/WidgetCell.java +++ b/src/com/android/launcher3/widget/WidgetCell.java @@ -143,8 +143,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { } // TODO(hyunyoungs): setup a cache for these labels. mWidgetName.setText(AppWidgetManagerCompat.getInstance(getContext()).loadLabel(info)); - int hSpan = Math.min(info.spanX, (int) grid.numColumns); - int vSpan = Math.min(info.spanY, (int) grid.numRows); + int hSpan = Math.min(info.spanX, grid.numColumns); + int vSpan = Math.min(info.spanY, grid.numRows); mWidgetDims.setText(String.format(mDimensionsFormatString, hSpan, vSpan)); mWidgetPreviewLoader = loader; } @@ -199,12 +199,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { Log.d(TAG, String.format("[tag=%s] ensurePreview (%d, %d):", getTagToString(), size[0], size[1])); } - Bitmap[] immediateResult = new Bitmap[1]; - mActiveRequest = mWidgetPreviewLoader.getPreview(mInfo, size[0], size[1], this, - immediateResult); - if (immediateResult[0] != null) { - applyPreview(immediateResult[0]); - } + mActiveRequest = mWidgetPreviewLoader.getPreview(mInfo, size[0], size[1], this); } @Override diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java index 2dbe7a532..b8124d6e3 100644 --- a/src/com/android/launcher3/widget/WidgetsListAdapter.java +++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java @@ -109,8 +109,7 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> { if (diff > 0) { for (int i = 0; i < diff; i++) { - WidgetCell widget = new WidgetCell(mContext); - widget = (WidgetCell) mLayoutInflater.inflate( + WidgetCell widget = (WidgetCell) mLayoutInflater.inflate( R.layout.widget_cell, row, false); // set up touch. @@ -135,11 +134,11 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> { tv.applyFromPackageItemInfo(infoOut); // Bind the view in the widget horizontal tray region. + if (getWidgetPreviewLoader() == null) { + return; + } for (int i=0; i < infoList.size(); i++) { WidgetCell widget = (WidgetCell) row.getChildAt(i); - if (getWidgetPreviewLoader() == null) { - return; - } if (infoList.get(i) instanceof LauncherAppWidgetProviderInfo) { LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo) infoList.get(i); PendingAddWidgetInfo pawi = new PendingAddWidgetInfo(info, null); |