diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-14 17:48:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-14 17:48:30 +0000 |
commit | 2a1be7a6165b49d21396bcb228a468bc79dd4d3e (patch) | |
tree | 0af8e196c7dacf0dcb04592f6c4914d57bf83d56 /src | |
parent | af2637376f5fb37d1dfa598a8c95a623367501ce (diff) | |
parent | c22841bfd1961781a84cfccb98d1c2937a9adee4 (diff) | |
download | android_packages_apps_Trebuchet-2a1be7a6165b49d21396bcb228a468bc79dd4d3e.tar.gz android_packages_apps_Trebuchet-2a1be7a6165b49d21396bcb228a468bc79dd4d3e.tar.bz2 android_packages_apps_Trebuchet-2a1be7a6165b49d21396bcb228a468bc79dd4d3e.zip |
Merge "Fixing shortcuts not getting migrated to app icons" into ub-launcher3-burnaby
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 7414a2204..9d2a890a6 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1999,7 +1999,7 @@ public class LauncherModel extends BroadcastReceiver "constructing info for partially restored package", true); info = getRestoredItemInfo(c, titleIndex, intent, - promiseType, cursorIconInfo, context); + promiseType, itemType, cursorIconInfo, context); intent = getRestoredItemIntent(c, context, intent); } else { // Don't restore items for other profiles. @@ -3380,7 +3380,7 @@ public class LauncherModel extends BroadcastReceiver * to a package that is not yet installed on the system. */ public ShortcutInfo getRestoredItemInfo(Cursor c, int titleIndex, Intent intent, - int promiseType, CursorIconInfo iconInfo, Context context) { + int promiseType, int itemType, CursorIconInfo iconInfo, Context context) { final ShortcutInfo info = new ShortcutInfo(); info.user = UserHandleCompat.myUserHandle(); @@ -3406,7 +3406,7 @@ public class LauncherModel extends BroadcastReceiver } info.contentDescription = mUserManager.getBadgedLabelForUser(info.title, info.user); - info.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT; + info.itemType = itemType; info.promisedIntent = intent; info.status = promiseType; return info; diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index ee72aea81..cc5e18bc1 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -772,7 +772,7 @@ public class LauncherProvider extends ContentProvider { long id = c.getLong(idIndex); updateStmt.bindLong(1, id); - updateStmt.execute(); + updateStmt.executeUpdateDelete(); } db.setTransactionSuccessful(); } catch (SQLException ex) { |