From 3bf013a1eb2764fb3c12dc55739cf3c78fd3c20c Mon Sep 17 00:00:00 2001 From: Artem Shvadskiy Date: Tue, 9 Feb 2016 13:27:40 -0800 Subject: Prevent finalizing of remote folder Change-Id: I69872c917e710e93db38891817a509c7a3e65e63 issue-id: CYNGNOS-1948 issue-id: CYNGNOS-1951 --- src/com/android/launcher3/Folder.java | 6 +++++- src/com/android/launcher3/LauncherModel.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') 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); -- cgit v1.2.3