diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-04-21 14:30:18 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-05-11 15:21:42 -0700 |
commit | eb4b79935e9f75dda72e4953f45e616e252d7b03 (patch) | |
tree | 5d99db4651efdbf698cda8a59016b8db5335ac9e /src/com/android/launcher3/util | |
parent | 4dcd8ffecc5bbdc5c7496cea4eb6808f4026bf9e (diff) | |
download | android_packages_apps_Trebuchet-eb4b79935e9f75dda72e4953f45e616e252d7b03.tar.gz android_packages_apps_Trebuchet-eb4b79935e9f75dda72e4953f45e616e252d7b03.tar.bz2 android_packages_apps_Trebuchet-eb4b79935e9f75dda72e4953f45e616e252d7b03.zip |
Removing icon_type column
Icon type is not used consistently. It is used initially
during the loader. Afterwards, we save both the icon and resource to the db.
Instead of changing the logic to always read the shortcut-resource first, and fallback to the bitmap if the resource is not available,
always write the bitmap to DB whenever the shortcut is edited.
Change-Id: I0ea5e88f8904bd3250ca669220b3e5d6aeef1bfd
Diffstat (limited to 'src/com/android/launcher3/util')
-rw-r--r-- | src/com/android/launcher3/util/CursorIconInfo.java | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/com/android/launcher3/util/CursorIconInfo.java b/src/com/android/launcher3/util/CursorIconInfo.java index cdf9e3c60..120eacd0a 100644 --- a/src/com/android/launcher3/util/CursorIconInfo.java +++ b/src/com/android/launcher3/util/CursorIconInfo.java @@ -30,13 +30,11 @@ import com.android.launcher3.Utilities; * Utility class to load icon from a cursor. */ public class CursorIconInfo { - public final int iconTypeIndex; public final int iconPackageIndex; public final int iconResourceIndex; public final int iconIndex; public CursorIconInfo(Cursor c) { - iconTypeIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_TYPE); iconIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON); iconPackageIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_PACKAGE); iconResourceIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_RESOURCE); @@ -44,26 +42,17 @@ public class CursorIconInfo { public Bitmap loadIcon(Cursor c, ShortcutInfo info, Context context) { Bitmap icon = null; - int iconType = c.getInt(iconTypeIndex); - switch (iconType) { - case LauncherSettings.Favorites.ICON_TYPE_RESOURCE: - String packageName = c.getString(iconPackageIndex); - String resourceName = c.getString(iconResourceIndex); - if (!TextUtils.isEmpty(packageName) || !TextUtils.isEmpty(resourceName)) { - info.iconResource = new ShortcutIconResource(); - info.iconResource.packageName = packageName; - info.iconResource.resourceName = resourceName; - icon = Utilities.createIconBitmap(packageName, resourceName, context); - } - if (icon == null) { - // Failed to load from resource, try loading from DB. - icon = Utilities.createIconBitmap(c, iconIndex, context); - } - break; - case LauncherSettings.Favorites.ICON_TYPE_BITMAP: + String packageName = c.getString(iconPackageIndex); + String resourceName = c.getString(iconResourceIndex); + if (!TextUtils.isEmpty(packageName) || !TextUtils.isEmpty(resourceName)) { + info.iconResource = new ShortcutIconResource(); + info.iconResource.packageName = packageName; + info.iconResource.resourceName = resourceName; + icon = Utilities.createIconBitmap(packageName, resourceName, context); + } + if (icon == null) { + // Failed to load from resource, try loading from DB. icon = Utilities.createIconBitmap(c, iconIndex, context); - info.customIcon = icon != null; - break; } return icon; } |