Protected App [3/3] Trebuchet - Protected Apps - Build fixed to work with LOCAL_SDK_VERSION - Fixed adding components to protected folders and adding protected folders to other folders - Fixed issues with EditText for FolderName - Adding support for Settings hooks - Uses Setting's LockPattern for Protected Apps - Add Read from Settings Secure DB (DO NOT WRITE!) - Protecting a folder updates Launcher without restart - Batch send component visibility

Conflicts:
	AndroidManifest.xml
	res/values/preferences_defaults.xml
	src/com/android/launcher3/AppsCustomizePagedView.java
	src/com/android/launcher3/Folder.java
	src/com/android/launcher3/FolderIcon.java
	src/com/android/launcher3/Launcher.java
	src/com/android/launcher3/LauncherModel.java
	src/com/android/launcher3/LauncherProvider.java
	src/com/android/launcher3/OverviewSettingsPanel.java

Change-Id: I41c295e7f2c9abc9b2e77e6e3d39b7ca60d47139

1 files changed, 26 insertions, 2 deletions

diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
index a359f1180..ef31bcf99 100644
--- a/src/com/android/launcher3/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -322,13 +322,23 @@ public class FolderIcon extends FrameLayout implements FolderListener {
 
     private boolean willAcceptItem(ItemInfo item) {
         final int itemType = item.itemType;
+
+        boolean hidden = false;
+        if (item instanceof FolderInfo){
+            hidden = ((FolderInfo) item).hidden;
+        }
         return ((itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION ||
-                itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) &&
-                !mFolder.isFull() && item != mInfo && !mInfo.opened);
+                itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT ||
+                itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) &&
+                !mFolder.isFull() && item != mInfo && !mInfo.opened &&
+                !hidden);
     }
 
     public boolean acceptDrop(Object dragInfo) {
         final ItemInfo item = (ItemInfo) dragInfo;
+        if (mInfo.hidden) {
+            return false;
+        }
         return !mFolder.isDestroyed() && willAcceptItem(item);
     }
 
@@ -619,6 +629,20 @@ public class FolderIcon extends FrameLayout implements FolderListener {
         }
 
         int nItemsInPreview = Math.min(items.size(), NUM_ITEMS_IN_PREVIEW);
+
+        // Hidden folder - don't display Preview
+        if (mInfo.hidden) {
+            mParams = computePreviewItemDrawingParams(NUM_ITEMS_IN_PREVIEW/2, mParams);
+            canvas.save();
+            canvas.translate(mParams.transX + mPreviewOffsetX, mParams.transY + mPreviewOffsetY);
+            canvas.scale(mParams.scale, mParams.scale);
+            Drawable lock = getResources().getDrawable(R.drawable.folder_lock);
+            lock.setBounds(0, 0, mIntrinsicIconSize, mIntrinsicIconSize);
+            lock.draw(canvas);
+            canvas.restore();
+            return;
+        }
+
         if (!mAnimating) {
             for (int i = nItemsInPreview - 1; i >= 0; i--) {
                 v = (TextView) items.get(i);