Winson Chung
eea0225304
- WidgetsAndShortcutNameComparator was using the actual widget and shortcut resolve infos as the key to the label cache. Neither of these classes override hashCode() and we were retrieving a new set of widgets and shortcuts whenever packages changed so we would end up creating more and more entries in the cache. This isn't a huge leak, but could lead to problems if Launcher is used for long periods without being killed. - Now, we use a ComponentKey as the key, so that we don't keep a reference to the widget/shortcut infos and also ensures that they should hash to the same labels. Change-Id: I91347ee72363adbc2b075b67dba331e35ab1fe34
98 lines
3.5 KiB
Java
98 lines
3.5 KiB
Java
package com.android.launcher3.model;
|
|
|
|
import android.content.ComponentName;
|
|
import android.content.Context;
|
|
import android.content.pm.PackageManager;
|
|
import android.content.pm.ResolveInfo;
|
|
import com.android.launcher3.LauncherAppWidgetProviderInfo;
|
|
import com.android.launcher3.Utilities;
|
|
import com.android.launcher3.compat.AppWidgetManagerCompat;
|
|
import com.android.launcher3.compat.UserHandleCompat;
|
|
import com.android.launcher3.util.ComponentKey;
|
|
|
|
import java.text.Collator;
|
|
import java.util.Comparator;
|
|
import java.util.HashMap;
|
|
|
|
public class WidgetsAndShortcutNameComparator implements Comparator<Object> {
|
|
private final AppWidgetManagerCompat mManager;
|
|
private final PackageManager mPackageManager;
|
|
private final HashMap<ComponentKey, String> mLabelCache;
|
|
private final Collator mCollator;
|
|
private final UserHandleCompat mMainHandle;
|
|
|
|
public WidgetsAndShortcutNameComparator(Context context) {
|
|
mManager = AppWidgetManagerCompat.getInstance(context);
|
|
mPackageManager = context.getPackageManager();
|
|
mLabelCache = new HashMap<>();
|
|
mCollator = Collator.getInstance();
|
|
mMainHandle = UserHandleCompat.myUserHandle();
|
|
}
|
|
|
|
/**
|
|
* Resets any stored state.
|
|
*/
|
|
public void reset() {
|
|
mLabelCache.clear();
|
|
}
|
|
|
|
@Override
|
|
public final int compare(Object objA, Object objB) {
|
|
ComponentKey keyA = getComponentKey(objA);
|
|
ComponentKey keyB = getComponentKey(objB);
|
|
|
|
// Independent of how the labels compare, if only one of the two widget info belongs to
|
|
// work profile, put that one in the back.
|
|
boolean aWorkProfile = !mMainHandle.equals(keyA.user);
|
|
boolean bWorkProfile = !mMainHandle.equals(keyB.user);
|
|
if (aWorkProfile && !bWorkProfile) {
|
|
return 1;
|
|
}
|
|
if (!aWorkProfile && bWorkProfile) {
|
|
return -1;
|
|
}
|
|
|
|
// Get the labels for comparison
|
|
String labelA = mLabelCache.get(keyA);
|
|
String labelB = mLabelCache.get(keyB);
|
|
if (labelA == null) {
|
|
labelA = getLabel(objA);
|
|
mLabelCache.put(keyA, labelA);
|
|
}
|
|
if (labelB == null) {
|
|
labelB = getLabel(objB);
|
|
mLabelCache.put(keyB, labelB);
|
|
}
|
|
return mCollator.compare(labelA, labelB);
|
|
}
|
|
|
|
/**
|
|
* @return a component key for the given widget or shortcut info.
|
|
*/
|
|
private ComponentKey getComponentKey(Object o) {
|
|
if (o instanceof LauncherAppWidgetProviderInfo) {
|
|
LauncherAppWidgetProviderInfo widgetInfo = (LauncherAppWidgetProviderInfo) o;
|
|
return new ComponentKey(widgetInfo.provider, mManager.getUser(widgetInfo));
|
|
} else {
|
|
ResolveInfo shortcutInfo = (ResolveInfo) o;
|
|
ComponentName cn = new ComponentName(shortcutInfo.activityInfo.packageName,
|
|
shortcutInfo.activityInfo.name);
|
|
// Currently, there are no work profile shortcuts
|
|
return new ComponentKey(cn, UserHandleCompat.myUserHandle());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @return the label for the given widget or shortcut info. This may be an expensive call.
|
|
*/
|
|
private String getLabel(Object o) {
|
|
if (o instanceof LauncherAppWidgetProviderInfo) {
|
|
LauncherAppWidgetProviderInfo widgetInfo = (LauncherAppWidgetProviderInfo) o;
|
|
return Utilities.trim(mManager.loadLabel(widgetInfo));
|
|
} else {
|
|
ResolveInfo shortcutInfo = (ResolveInfo) o;
|
|
return Utilities.trim(shortcutInfo.loadLabel(mPackageManager));
|
|
}
|
|
}
|
|
};
|