diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-02-23 11:36:21 -0800 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-02-23 11:36:21 -0800 |
commit | d31dcbcc7c7901959c65c4e635e59274a1d4c334 (patch) | |
tree | 89c9ddeaade8e5f058090180bd0b5049efb7fa3d /src/com/android/launcher3/model/WidgetsModel.java | |
parent | e1bd986d77afc9426e320b7cce53993086f9d8ba (diff) | |
download | android_packages_apps_Trebuchet-d31dcbcc7c7901959c65c4e635e59274a1d4c334.tar.gz android_packages_apps_Trebuchet-d31dcbcc7c7901959c65c4e635e59274a1d4c334.tar.bz2 android_packages_apps_Trebuchet-d31dcbcc7c7901959c65c4e635e59274a1d4c334.zip |
Manual revert due to conflict:
Revert "Load label in bg thread to prevent ANR b/27238970"
This reverts commit b62fd0957607ae54c7bca7ce64eed288a11f0f2f.
Change-Id: Ia751e3414fb24a18bb8bb9ca09dcd93d0e4249f6
Diffstat (limited to 'src/com/android/launcher3/model/WidgetsModel.java')
-rw-r--r-- | src/com/android/launcher3/model/WidgetsModel.java | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java index 5051e6220..99a53ff36 100644 --- a/src/com/android/launcher3/model/WidgetsModel.java +++ b/src/com/android/launcher3/model/WidgetsModel.java @@ -3,7 +3,6 @@ package com.android.launcher3.model; import android.content.ComponentName; import android.content.Context; -import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.util.Log; @@ -17,7 +16,6 @@ import com.android.launcher3.Utilities; import com.android.launcher3.compat.AlphabeticIndexCompat; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.compat.UserHandleCompat; -import com.android.launcher3.util.ComponentKey; import java.util.ArrayList; import java.util.Collections; @@ -41,11 +39,7 @@ public class WidgetsModel { /* Map of widgets and shortcuts that are tracked per package. */ private final HashMap<PackageItemInfo, ArrayList<Object>> mWidgetsList; - /* Labels of widgets */ - private final HashMap<ComponentKey, CharSequence> mLabels; - private final AppWidgetManagerCompat mAppWidgetMgr; - private final PackageManager mPackageMgr; private final WidgetsAndShortcutNameComparator mWidgetAndShortcutNameComparator; private final Comparator<ItemInfo> mAppNameComparator; private final IconCache mIconCache; @@ -56,7 +50,6 @@ public class WidgetsModel { public WidgetsModel(Context context, IconCache iconCache, AppFilter appFilter) { mAppWidgetMgr = AppWidgetManagerCompat.getInstance(context); - mPackageMgr = context.getPackageManager(); mWidgetAndShortcutNameComparator = new WidgetsAndShortcutNameComparator(context); mAppNameComparator = (new AppNameComparator(context)).getAppInfoComparator(); mIconCache = iconCache; @@ -64,14 +57,13 @@ public class WidgetsModel { mIndexer = new AlphabeticIndexCompat(context); mPackageItemInfos = new ArrayList<>(); mWidgetsList = new HashMap<>(); + mRawList = new ArrayList<>(); - mLabels = new HashMap<>(); } @SuppressWarnings("unchecked") private WidgetsModel(WidgetsModel model) { mAppWidgetMgr = model.mAppWidgetMgr; - mPackageMgr = model.mPackageMgr; mPackageItemInfos = (ArrayList<PackageItemInfo>) model.mPackageItemInfos.clone(); mWidgetsList = (HashMap<PackageItemInfo, ArrayList<Object>>) model.mWidgetsList.clone(); mWidgetAndShortcutNameComparator = model.mWidgetAndShortcutNameComparator; @@ -80,7 +72,6 @@ public class WidgetsModel { mAppFilter = model.mAppFilter; mIndexer = model.mIndexer; mRawList = (ArrayList<Object>) model.mRawList.clone(); - mLabels = (HashMap<ComponentKey, CharSequence>) model.mLabels.clone(); } // Access methods that may be deleted if the private fields are made package-private. @@ -96,22 +87,6 @@ public class WidgetsModel { return mPackageItemInfos.get(pos); } - public CharSequence getLabel(Object info) { - ComponentKey key; - if (info instanceof LauncherAppWidgetProviderInfo) { - key = new ComponentKey(((LauncherAppWidgetProviderInfo) info).provider, - mAppWidgetMgr.getUser(((LauncherAppWidgetProviderInfo) info))); - return mLabels.get(key); - } else if (info instanceof ResolveInfo) { - ResolveInfo ri = (ResolveInfo) info; - ComponentName componentName = new ComponentName(ri.activityInfo.packageName, - ri.activityInfo.name); - key = new ComponentKey(componentName, UserHandleCompat.myUserHandle()); - return mLabels.get(key); - } - return null; - } - public List<Object> getSortedWidgets(int pos) { return mWidgetsList.get(mPackageItemInfos.get(pos)); } @@ -134,7 +109,6 @@ public class WidgetsModel { // clear the lists. mWidgetsList.clear(); mPackageItemInfos.clear(); - mLabels.clear(); mWidgetAndShortcutNameComparator.reset(); InvariantDeviceProfile idp = LauncherAppState.getInstance().getInvariantDeviceProfile(); @@ -144,7 +118,6 @@ public class WidgetsModel { String packageName = ""; UserHandleCompat userHandle = null; ComponentName componentName = null; - ComponentKey key = null; if (o instanceof LauncherAppWidgetProviderInfo) { LauncherAppWidgetProviderInfo widgetInfo = (LauncherAppWidgetProviderInfo) o; @@ -164,16 +137,12 @@ public class WidgetsModel { } continue; } - key = new ComponentKey(componentName, userHandle); - mLabels.put(key, mAppWidgetMgr.loadLabel(widgetInfo)); } else if (o instanceof ResolveInfo) { ResolveInfo resolveInfo = (ResolveInfo) o; componentName = new ComponentName(resolveInfo.activityInfo.packageName, resolveInfo.activityInfo.name); packageName = resolveInfo.activityInfo.packageName; userHandle = UserHandleCompat.myUserHandle(); - key = new ComponentKey(componentName, userHandle); - mLabels.put(key, resolveInfo.loadLabel(mPackageMgr)); } if (componentName == null || userHandle == null) { |