Load label in bg thread to prevent ANR

b/27238970

Change-Id: Ic5d77df7d5276cee07861d59427a94fb19691d9c

2 files changed, 19 insertions, 35 deletions

diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 70eceb9ce..ec2bd70b1 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -137,32 +137,23 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
     }
 
     /**
-     * Apply the widget provider info to the view.
+     * Apply the widget provider info or the resolve info to the view.
      */
-    public void applyFromAppWidgetProviderInfo(LauncherAppWidgetProviderInfo info,
-            WidgetPreviewLoader loader) {
-
-        InvariantDeviceProfile profile =
-                LauncherAppState.getInstance().getInvariantDeviceProfile();
+    public void applyFromInfo(Object info, CharSequence label,
+                                               WidgetPreviewLoader loader) {
         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 ac9d62e9a..55a2f7a34 100644
--- a/src/com/android/launcher3/widget/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java
@@ -16,9 +16,7 @@
 package com.android.launcher3.widget;
 
 import android.annotation.TargetApi;
-import android.content.Context;
 import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
 import android.os.Build;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.Adapter;
@@ -30,7 +28,6 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.LinearLayout;
 
 import com.android.launcher3.BubbleTextView;
-import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
@@ -136,17 +133,13 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> {
         }
         for (int i=0; i < infoList.size(); i++) {
             WidgetCell widget = (WidgetCell) row.getChildAt(i);
-            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);
+            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));
             }
+            widget.applyFromInfo(info, mWidgetsModel.getLabel(info), mWidgetPreviewLoader);
             widget.ensurePreview();
             widget.setVisibility(View.VISIBLE);
         }