diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-12-26 13:01:07 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-26 13:38:33 +0000 |
| commit | 8fb7b9eadd45959d2c3aca9a1bb910ca875cc593 (patch) | |
| tree | a652102d46137188697b4e225d6312f432026c92 /src/com/cyanogenmod/trebuchet/DeleteDropTarget.java | |
| parent | 8fb6e3e975674d6960dc370ce0d2c7dd80b50117 (diff) | |
| download | android_packages_apps_Trebuchet-8fb7b9eadd45959d2c3aca9a1bb910ca875cc593.tar.gz android_packages_apps_Trebuchet-8fb7b9eadd45959d2c3aca9a1bb910ca875cc593.tar.bz2 android_packages_apps_Trebuchet-8fb7b9eadd45959d2c3aca9a1bb910ca875cc593.zip | |
LauncherActions: Don't use magic intents
Change-Id: I5ee3fbc9b1cdc63407def751bb7639cb54bdb7c3
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/DeleteDropTarget.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/DeleteDropTarget.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java index 55381d4c2..3a1e94e6d 100644 --- a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java +++ b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java @@ -113,6 +113,7 @@ public class DeleteDropTarget extends ButtonDropTarget { switch (addInfo.itemType) { case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET: + case LauncherSettings.Favorites.ITEM_TYPE_LAUNCHER_ACTION: return true; } } @@ -159,10 +160,12 @@ public class DeleteDropTarget extends ButtonDropTarget { } else if (isWorkspaceOrFolderApplication(source, info)) { ShortcutInfo shortcutInfo = (ShortcutInfo) info; PackageManager pm = getContext().getPackageManager(); - ResolveInfo resolveInfo = pm.resolveActivity(shortcutInfo.intent, 0); - if (resolveInfo != null && (resolveInfo.activityInfo.applicationInfo.flags & - android.content.pm.ApplicationInfo.FLAG_SYSTEM) == 0) { - isUninstall = true; + if (shortcutInfo.itemType != LauncherSettings.Favorites.ITEM_TYPE_LAUNCHER_ACTION) { + ResolveInfo resolveInfo = pm.resolveActivity(shortcutInfo.intent, 0); + if (resolveInfo != null && (resolveInfo.activityInfo.applicationInfo.flags & + android.content.pm.ApplicationInfo.FLAG_SYSTEM) == 0) { + isUninstall = true; + } } } |