From 988cbecc57ef0b25dda5e483299e7c215bcce6da Mon Sep 17 00:00:00 2001
From: Raj Yengisetty <rajesh@cyngn.com>
Date: Mon, 10 Nov 2014 10:35:01 -0800
Subject: Protected Folder Fragment: Add remove Shortcut from list.

Change-Id: I0e9f141bc34bcfa955d7f5f3535d9d437e94b1da
---
 src/com/android/launcher3/HiddenFolderFragment.java | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'src/com/android/launcher3/HiddenFolderFragment.java')

diff --git a/src/com/android/launcher3/HiddenFolderFragment.java b/src/com/android/launcher3/HiddenFolderFragment.java
index d43f61d23..07b0e4a8a 100644
--- a/src/com/android/launcher3/HiddenFolderFragment.java
+++ b/src/com/android/launcher3/HiddenFolderFragment.java
@@ -140,6 +140,16 @@ public class HiddenFolderFragment extends Fragment {
         return apps;
     }
 
+    private void removeComponentFromFolder(AppEntry app) {
+        mLauncher.mHiddenFolderIcon.getFolderInfo().remove(
+                mLauncher.mHiddenFolderIcon.getFolder()
+                        .getShortcutForComponent(app.componentName));
+
+        mAppEntries.remove(app);
+        mAppsAdapter.remove(app);
+        mAppsAdapter.notifyDataSetInvalidated();
+    }
+
     public void saveHiddenFolderStatus(int position) {
         String newTitle = mFolderName.getText().toString();
         if (mLauncher.mHiddenFolderIcon != null) {
@@ -221,12 +231,18 @@ public class HiddenFolderFragment extends Fragment {
                 viewHolder = (AppViewHolder) convertView.getTag();
             }
 
-            AppEntry app = getItem(position);
+            final AppEntry app = getItem(position);
 
             viewHolder.title.setText(app.title);
 
             Drawable icon = mIcons.get(app.componentName.getPackageName());
             viewHolder.icon.setImageDrawable(icon != null ? icon : mDefaultImg);
+            viewHolder.remove.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    removeComponentFromFolder(app);
+                }
+            });
 
             convertView.setOnClickListener(new OnClickListener() {
                 @Override
@@ -314,10 +330,12 @@ public class HiddenFolderFragment extends Fragment {
     private static class AppViewHolder {
         public final TextView title;
         public final ImageView icon;
+        public final ImageView remove;
         public final int position;
 
         public AppViewHolder(View parentView, int position) {
             icon = (ImageView) parentView.findViewById(R.id.icon);
+            remove = (ImageView) parentView.findViewById(R.id.remove);
             title = (TextView) parentView.findViewById(R.id.title);
             this.position = position;
         }
-- 
cgit v1.2.3