diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-03-05 18:07:04 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2014-12-05 16:18:41 -0800 |
| commit | 5940042d39b576553c2499bcf3d0641281e6ad52 (patch) | |
| tree | 45eb331399dc9f0fd86f4a3dc58dada50fb9ec46 /src/com/android/launcher3/DeleteDropTarget.java | |
| parent | e64b0dfcd0d4113e9259b6270cff734089f4cd3f (diff) | |
| download | android_packages_apps_Trebuchet-5940042d39b576553c2499bcf3d0641281e6ad52.tar.gz android_packages_apps_Trebuchet-5940042d39b576553c2499bcf3d0641281e6ad52.tar.bz2 android_packages_apps_Trebuchet-5940042d39b576553c2499bcf3d0641281e6ad52.zip | |
Supporting custom widgets provided by launcher
-> This change provides integration for widgets provided by
the launcher package which can run arbitrary code.
Change-Id: I6052da5c4afed7ee72e3b44d045b9c46f2d84c42
Diffstat (limited to 'src/com/android/launcher3/DeleteDropTarget.java')
| -rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index ea058ea71..5a5c0027e 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -105,6 +105,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_CUSTOM_APPWIDGET: return true; } } @@ -146,6 +147,7 @@ public class DeleteDropTarget extends ButtonDropTarget { if (info instanceof ItemInfo) { ItemInfo item = (ItemInfo) info; if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET || + item.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET || item.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) { return true; } @@ -341,7 +343,9 @@ public class DeleteDropTarget extends ButtonDropTarget { final LauncherAppWidgetInfo launcherAppWidgetInfo = (LauncherAppWidgetInfo) item; final LauncherAppWidgetHost appWidgetHost = mLauncher.getAppWidgetHost(); - if ((appWidgetHost != null) && launcherAppWidgetInfo.isWidgetIdValid()) { + + if (appWidgetHost != null && !launcherAppWidgetInfo.isCustomWidget() + && launcherAppWidgetInfo.isWidgetIdValid()) { // Deleting an app widget ID is a void call but writes to disk before returning // to the caller... new AsyncTask<Void, Void, Void>() { |