Cleaning up LauncherModel

- performing all DB operations immediately if called from worker thread (a previous change that did this in updateItemInDatabase fixed an outstanding bug)
- centralizing logic to do database updates
- removing old logging code

Change-Id: Idc7bfef3921828ff7c5492b8e996c0a07e1ec508

1 files changed, 5 insertions, 7 deletions

diff --git a/src/com/android/launcher2/ShortcutInfo.java b/src/com/android/launcher2/ShortcutInfo.java
index 6d4853ff4..c0f80aeec 100644
--- a/src/com/android/launcher2/ShortcutInfo.java
+++ b/src/com/android/launcher2/ShortcutInfo.java
@@ -62,14 +62,12 @@ class ShortcutInfo extends ItemInfo {
      */
     private Bitmap mIcon;
 
-    ShortcutInfo(String whereCreated) {
-        super(whereCreated);
+    ShortcutInfo() {
         itemType = LauncherSettings.BaseLauncherColumns.ITEM_TYPE_SHORTCUT;
-        this.whereCreated = whereCreated;
     }
     
-    public ShortcutInfo(ShortcutInfo info, String whereCreated) {
-        super(info, whereCreated);
+    public ShortcutInfo(ShortcutInfo info) {
+        super(info);
         title = info.title.toString();
         intent = new Intent(info.intent);
         if (info.iconResource != null) {
@@ -82,8 +80,8 @@ class ShortcutInfo extends ItemInfo {
     }
 
     /** TODO: Remove this.  It's only called by ApplicationInfo.makeShortcut. */
-    public ShortcutInfo(ApplicationInfo info, String whereCreated) {
-        super(info, whereCreated);
+    public ShortcutInfo(ApplicationInfo info) {
+        super(info);
         title = info.title.toString();
         intent = new Intent(info.intent);
         customIcon = false;