diff options
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 2e73c5749..82488169f 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -1562,15 +1562,19 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList /** * Update the view tied to this shortcut. * @param info updated info to be applied to view. + * @return true if view for info was found, false otherwise. */ @SuppressWarnings("unused") - public void updateViewForInfo(final ShortcutInfo info) { + public boolean updateViewForInfo(final ShortcutInfo info) { View v = getViewForInfo(info); if (v != null & v instanceof BubbleTextView) { ((BubbleTextView) v).reapplyItemInfo(info); mItemsInvalidated = true; + return true; } + + return false; } public View getViewForInfo(ShortcutInfo item) { diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 2934b600d..f8f539016 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2734,7 +2734,9 @@ public class LauncherModel extends BroadcastReceiver finalItem.container = folder.container; LauncherModel.deleteItemFromDatabase(mContext, folder); // only replace this item back on the workspace if it's not protected - if (!mHiddenApps.contains(finalItem.intent.getComponent())) { + // and not a remote folder. + if (!mHiddenApps.contains(finalItem.intent.getComponent()) && + !folder.isRemote()) { LauncherModel.addOrMoveItemInDatabase(mContext, finalItem, folder.container, folder.screenId, folder.cellX, folder.cellY); workspaceItems.add(finalItem); |