From 174345ec50101d61f9b1950d4c30afcb962de7e2 Mon Sep 17 00:00:00 2001 From: Artem Shvadskiy Date: Wed, 9 Dec 2015 16:04:48 -0800 Subject: Prevent remote folder from accepting or removing items by user. Patch 2: Rebase and use isRemote() instead of checking subType manually. Change-Id: If3954cfea1e26fc92de8818e68d732d2a5aeaa7b issue-id: CYNGNOS-1410 --- src/com/android/launcher3/FolderIcon.java | 4 ++++ src/com/android/launcher3/RemoteFolder.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index c41485668..33787ab35 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -373,10 +373,14 @@ public class FolderIcon extends FrameLayout implements FolderListener { } private boolean willAcceptItem(ItemInfo item) { + if (mInfo.isRemote()) return false; + final int itemType = item.itemType; boolean hidden = false; if (item instanceof FolderInfo){ + if (((FolderInfo) item).isRemote()) return false; + hidden = ((FolderInfo) item).hidden; } return ((itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION || diff --git a/src/com/android/launcher3/RemoteFolder.java b/src/com/android/launcher3/RemoteFolder.java index 9478ea641..136489466 100644 --- a/src/com/android/launcher3/RemoteFolder.java +++ b/src/com/android/launcher3/RemoteFolder.java @@ -173,6 +173,12 @@ public class RemoteFolder extends Folder { } } + @Override + public boolean onLongClick(View v) { + // Eat the event without doing anything. We do not allow users to remove items. + return true; + } + private void toggleInfoPane() { if (mFolderHelpText.getVisibility() == VISIBLE) { // info ImageView becomes a close "X" when the help text is showing, handle accordingly -- cgit v1.2.3