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/LauncherProvider.java | |
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/LauncherProvider.java')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index f10099e0c..5cc5aa6ec 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -1077,8 +1077,6 @@ public class LauncherProvider extends ContentProvider { = c.getColumnIndexOrThrow(LauncherSettings.Favorites.INTENT); final int titleIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE); - final int iconTypeIndex - = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_TYPE); final int iconIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON); final int iconPackageIndex @@ -1195,8 +1193,6 @@ public class LauncherProvider extends ContentProvider { values.put(LauncherSettings.Favorites._ID, c.getInt(idIndex)); values.put(LauncherSettings.Favorites.INTENT, intentStr); values.put(LauncherSettings.Favorites.TITLE, c.getString(titleIndex)); - values.put(LauncherSettings.Favorites.ICON_TYPE, - c.getInt(iconTypeIndex)); values.put(LauncherSettings.Favorites.ICON, c.getBlob(iconIndex)); values.put(LauncherSettings.Favorites.ICON_PACKAGE, c.getString(iconPackageIndex)); |