aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 07:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensuring that ShortcutInfo always has an icon

Browse Source 
> Making iconBitmap public instead of a getter (similar to AppInfo)
> Removing getIcon() which can lead to IO on UI thread
> Removing updateIcon and handling the update at the caller

Bug: 21325319
Change-Id: I6a49b9043f974e9629ea25e77012d97cc04c0594
This commit is contained in:
Sunny Goyal
2016-11-09 10:43:58 -08:00
parent 824c540f19
commit 1cd01b023a
17 changed files with 87 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/launcher3/model/PackageUpdatedTask.java
View File

@@ -34,6 +34,7 @@ import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherModel.CallbackTask;
import com.android.launcher3.LauncherModel.Callbacks;
import com.android.launcher3.LauncherSettings;
import com.android.launcher3.LauncherSettings.Favorites;
import com.android.launcher3.ShortcutInfo;
import com.android.launcher3.Utilities;
import com.android.launcher3.compat.LauncherAppsCompat;
@@ -209,11 +210,9 @@ public class PackageUpdatedTask extends ExtendedModelTask {
// Update shortcuts which use iconResource.
if ((si.iconResource != null)
&& packageSet.contains(si.iconResource.packageName)) {
Bitmap icon = LauncherIcons.createIconBitmap(
si.iconResource.packageName,
si.iconResource.resourceName, context);
Bitmap icon = LauncherIcons.createIconBitmap(si.iconResource, context);
if (icon != null) {
si.setIcon(icon);
si.iconBitmap = icon;
infoUpdated = true;
}
}
@@ -251,14 +250,16 @@ public class PackageUpdatedTask extends ExtendedModelTask {
si.promisedIntent = null;
si.status = ShortcutInfo.DEFAULT;
infoUpdated = true;
si.updateIcon(iconCache);
if (si.itemType == Favorites.ITEM_TYPE_APPLICATION) {
iconCache.getTitleAndIcon(si, si.getPromisedIntent(),
si.user, si.usingLowResIcon);
}
}
if (appInfo != null && Intent.ACTION_MAIN.equals(si.intent.getAction())
&& si.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
si.updateIcon(iconCache);
si.title = Utilities.trim(appInfo.title);
si.contentDescription = appInfo.contentDescription;
iconCache.getTitleAndIcon(
si, si.getPromisedIntent(), si.user, si.usingLowResIcon);
infoUpdated = true;
}