diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 6080411b31..1657a508ab 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -1721,24 +1721,6 @@ public class LauncherModel extends BroadcastReceiver { } } - /** - * Returns all the Workspace ShortcutInfos associated with a particular package. - * @param intent - * @return - */ - ArrayList getShortcutInfosForPackage(String packageName) { - ArrayList infos = new ArrayList(); - for (ItemInfo i : sWorkspaceItems) { - if (i instanceof ShortcutInfo) { - ShortcutInfo info = (ShortcutInfo) i; - if (packageName.equals(info.getPackageName())) { - infos.add(info); - } - } - } - return infos; - } - /** * This is called from the code that adds shortcuts from the intent receiver. This * doesn't have a Cursor, but diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 7248950e8b..feb4ed0778 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3635,11 +3635,7 @@ public class Workspace extends SmoothPagedView }); } - // It is no longer the case the BubbleTextViews correspond 1:1 with the workspace items in - // the database (and LauncherModel) since shortcuts are not added and animated in until - // the user returns to launcher. As a result, we really should be cleaning up the Db - // regardless of whether the item was added or not (unlike the logic above). This is only - // relevant for direct workspace items. + // Clean up new-apps animation list post(new Runnable() { @Override public void run() { @@ -3649,26 +3645,18 @@ public class Workspace extends SmoothPagedView Set newApps = sp.getStringSet(InstallShortcutReceiver.NEW_APPS_LIST_KEY, null); - for (String packageName: packageNames) { - // Remove all items that have the same package, but were not removed above - ArrayList infos = - mLauncher.getModel().getShortcutInfosForPackage(packageName); - for (ShortcutInfo info : infos) { - LauncherModel.deleteItemFromDatabase(mLauncher, info); - } - // Remove all queued items that match the same package - if (newApps != null) { - synchronized (newApps) { - Iterator iter = newApps.iterator(); - while (iter.hasNext()) { - try { - Intent intent = Intent.parseUri(iter.next(), 0); - String pn = ItemInfo.getPackageName(intent); - if (packageNames.contains(pn)) { - iter.remove(); - } - } catch (URISyntaxException e) {} - } + // Remove all queued items that match the same package + if (newApps != null) { + synchronized (newApps) { + Iterator iter = newApps.iterator(); + while (iter.hasNext()) { + try { + Intent intent = Intent.parseUri(iter.next(), 0); + String pn = ItemInfo.getPackageName(intent); + if (packageNames.contains(pn)) { + iter.remove(); + } + } catch (URISyntaxException e) {} } } }