From d31dcbcc7c7901959c65c4e635e59274a1d4c334 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 23 Feb 2016 11:36:21 -0800
Subject: Manual revert due to conflict:

Revert "Load label in bg thread to prevent ANR b/27238970"

This reverts commit b62fd0957607ae54c7bca7ce64eed288a11f0f2f.

Change-Id: Ia751e3414fb24a18bb8bb9ca09dcd93d0e4249f6
---
 src/com/android/launcher3/widget/WidgetCell.java   | 35 ++++++++++++++--------
 .../launcher3/widget/WidgetsListAdapter.java       | 16 ++++++----
 2 files changed, 32 insertions(+), 19 deletions(-)

(limited to 'src/com/android/launcher3/widget')

diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 75c84c32f..94bbd929f 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -136,23 +136,32 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     /**
-     * Apply the widget provider info or the resolve info to the view.
+     * Apply the widget provider info to the view.
      */
-    public void applyFromInfo(Object info, CharSequence label,
-                                               WidgetPreviewLoader loader) {
+    public void applyFromAppWidgetProviderInfo(LauncherAppWidgetProviderInfo info,
+            WidgetPreviewLoader loader) {
+
+        InvariantDeviceProfile profile =
+                LauncherAppState.getInstance().getInvariantDeviceProfile();
         mInfo = info;
+        // TODO(hyunyoungs): setup a cache for these labels.
+        mWidgetName.setText(AppWidgetManagerCompat.getInstance(getContext()).loadLabel(info));
+        int hSpan = Math.min(info.spanX, profile.numColumns);
+        int vSpan = Math.min(info.spanY, profile.numRows);
+        mWidgetDims.setText(String.format(mDimensionsFormatString, hSpan, vSpan));
+        mWidgetPreviewLoader = loader;
+    }
+
+    /**
+     * Apply the resolve info to the view.
+     */
+    public void applyFromResolveInfo(
+            PackageManager pm, ResolveInfo info, WidgetPreviewLoader loader) {
+        mInfo = info;
+        CharSequence label = info.loadLabel(pm);
         mWidgetName.setText(label);
+        mWidgetDims.setText(String.format(mDimensionsFormatString, 1, 1));
         mWidgetPreviewLoader = loader;
-        if (info instanceof LauncherAppWidgetProviderInfo) {
-            InvariantDeviceProfile profile =
-                    LauncherAppState.getInstance().getInvariantDeviceProfile();
-            int hSpan = Math.min(((LauncherAppWidgetProviderInfo)info).spanX, profile.numColumns);
-            int vSpan = Math.min(((LauncherAppWidgetProviderInfo)info).spanY, profile.numRows);
-            mWidgetDims.setText(String.format(mDimensionsFormatString, hSpan, vSpan));
-        }
-        if (info instanceof ResolveInfo) {
-            mWidgetDims.setText(String.format(mDimensionsFormatString, 1, 1));
-        }
     }
 
     public int[] getPreviewSize() {
diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java
index f2d00271e..885d96fe5 100644
--- a/src/com/android/launcher3/widget/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java
@@ -139,13 +139,17 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> {
         }
         for (int i=0; i < infoList.size(); i++) {
             WidgetCell widget = (WidgetCell) row.getChildAt(i);
-            Object info = infoList.get(i);
-            if (info instanceof LauncherAppWidgetProviderInfo) {
-                widget.setTag(new PendingAddWidgetInfo(mLauncher, (LauncherAppWidgetProviderInfo)info, null));
-            } else if (info instanceof ResolveInfo) {
-                widget.setTag(new PendingAddShortcutInfo(((ResolveInfo) info).activityInfo));
+            if (infoList.get(i) instanceof LauncherAppWidgetProviderInfo) {
+                LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo) infoList.get(i);
+                PendingAddWidgetInfo pawi = new PendingAddWidgetInfo(mLauncher, info, null);
+                widget.setTag(pawi);
+                widget.applyFromAppWidgetProviderInfo(info, mWidgetPreviewLoader);
+            } else if (infoList.get(i) instanceof ResolveInfo) {
+                ResolveInfo info = (ResolveInfo) infoList.get(i);
+                PendingAddShortcutInfo pasi = new PendingAddShortcutInfo(info.activityInfo);
+                widget.setTag(pasi);
+                widget.applyFromResolveInfo(mLauncher.getPackageManager(), info, mWidgetPreviewLoader);
             }
-            widget.applyFromInfo(info, mWidgetsModel.getLabel(info), mWidgetPreviewLoader);
             widget.ensurePreview();
             widget.setVisibility(View.VISIBLE);
         }
-- 
cgit v1.2.3