diff options
author | Winson Chung <winsonc@google.com> | 2012-04-27 15:12:38 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2012-04-27 15:15:11 -0700 |
commit | 11a4937fbff0dbc50fb022513dc3b6c643154445 (patch) | |
tree | a602fc06eae7006b840fc84c47c1497f15a6619c /src/com/android/launcher2/Workspace.java | |
parent | 9cfcb39bffaffe2123cc6e6a39b4e32ee440fda5 (diff) | |
download | android_packages_apps_Trebuchet-11a4937fbff0dbc50fb022513dc3b6c643154445.tar.gz android_packages_apps_Trebuchet-11a4937fbff0dbc50fb022513dc3b6c643154445.tar.bz2 android_packages_apps_Trebuchet-11a4937fbff0dbc50fb022513dc3b6c643154445.zip |
Fixing issue where shortcuts and widgets were not being removed when the package was uninstalled (Bug 2657997, Bug 6335843)
- Also fixes issue if we are dragging a shortcut/widget and it is removed.
- Also exposes App Info for shortcuts and widgets
Change-Id: I3bd5056f50f20e8b277dde6456df26eac815bcde
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 892000d39..aa378dfd2 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3602,7 +3602,7 @@ public class Workspace extends SmoothPagedView final Intent intent = info.intent; final ComponentName name = intent.getComponent(); - if (Intent.ACTION_MAIN.equals(intent.getAction()) && name != null) { + if (name != null) { for (String packageName: packageNames) { if (packageName.equals(name.getPackageName())) { LauncherModel.deleteItemFromDatabase(mLauncher, info); @@ -3622,7 +3622,7 @@ public class Workspace extends SmoothPagedView final Intent intent = appInfo.intent; final ComponentName name = intent.getComponent(); - if (Intent.ACTION_MAIN.equals(intent.getAction()) && name != null) { + if (name != null) { for (String packageName: packageNames) { if (packageName.equals(name.getPackageName())) { appsToRemoveFromFolder.add(appInfo); @@ -3636,11 +3636,10 @@ public class Workspace extends SmoothPagedView } } else if (tag instanceof LauncherAppWidgetInfo) { final LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) tag; - final AppWidgetProviderInfo provider = - widgets.getAppWidgetInfo(info.appWidgetId); + final ComponentName provider = info.providerName; if (provider != null) { for (String packageName: packageNames) { - if (packageName.equals(provider.provider.getPackageName())) { + if (packageName.equals(provider.getPackageName())) { LauncherModel.deleteItemFromDatabase(mLauncher, info); childrenToRemove.add(view); } |