Merge "Trebuchet : Cling for live folders" into cm-10.2

3 files changed, 35 insertions, 6 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Cling.java b/src/com/cyanogenmod/trebuchet/Cling.java
index d3abe07f1..e1d8dab44 100644
--- a/src/com/cyanogenmod/trebuchet/Cling.java
+++ b/src/com/cyanogenmod/trebuchet/Cling.java
@@ -39,6 +39,7 @@ public class Cling extends FrameLayout {
     static final String ALLAPPS_CLING_DISMISSED_KEY = "cling.allapps.dismissed";
     static final String ALLAPPS_SORT_CLING_DISMISSED_KEY = "cling.allappssort.dismissed";
     static final String FOLDER_CLING_DISMISSED_KEY = "cling.folder.dismissed";
+    static final String LIVE_FOLDER_CLING_DISMISSED_KEY = "cling.live_folder.dismissed";
 
     private static String WORKSPACE_PORTRAIT = "workspace_portrait";
     private static String WORKSPACE_LANDSCAPE = "workspace_landscape";
diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java
index d55338b4d..c5b733101 100644
--- a/src/com/cyanogenmod/trebuchet/Folder.java
+++ b/src/com/cyanogenmod/trebuchet/Folder.java
@@ -481,7 +481,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             public void onAnimationEnd(Animator animation) {
                 mState = STATE_OPEN;
                 setLayerType(LAYER_TYPE_NONE, null);
-                Cling cling = mLauncher.showFirstRunFoldersCling();
+                Cling cling = mLauncher.showFirstRunFoldersCling(mInfo instanceof LiveFolderInfo);
                 if (cling != null) {
                     cling.bringToFront();
                 }
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index fcf4754fa..2087a4d53 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -4332,11 +4332,30 @@ public final class Launcher extends Activity
             removeCling(R.id.all_apps_sort_cling);
         }
     }
-    public Cling showFirstRunFoldersCling() {
+    public Cling showFirstRunFoldersCling(boolean isLiveFolder) {
+        String key = null;
+        if (isLiveFolder) {
+            key = Cling.LIVE_FOLDER_CLING_DISMISSED_KEY;
+        } else {
+            key = Cling.FOLDER_CLING_DISMISSED_KEY;
+        }
         // Enable the clings only if they have not been dismissed before
         if (isClingsEnabled() &&
-                !mSharedPrefs.getBoolean(Cling.FOLDER_CLING_DISMISSED_KEY, false)) {
-            return initCling(R.id.folder_cling, null, true, 0);
+                !mSharedPrefs.getBoolean(key, false)) {
+            Cling cling = initCling(R.id.folder_cling, null, true, 0);
+            cling.findViewById(R.id.cling_dismiss).setTag(isLiveFolder);
+            int titleRes = 0;
+            int textRes = 0;
+            if (isLiveFolder) {
+                titleRes = R.string.live_folder_cling_title;
+                textRes = R.string.live_folder_cling_create_folder;
+            } else {
+                titleRes = R.string.folder_cling_title;
+                textRes = R.string.folder_cling_create_folder;
+            }
+            ((TextView) cling.findViewById(R.id.folder_cling_title)).setText(titleRes);
+            ((TextView) cling.findViewById(R.id.folder_cling_text)).setText(textRes);
+            return cling;
         } else {
             removeCling(R.id.folder_cling);
             return null;
@@ -4359,8 +4378,17 @@ public final class Launcher extends Activity
         dismissCling(cling, Cling.ALLAPPS_SORT_CLING_DISMISSED_KEY, DISMISS_CLING_DURATION);
     }
     public void dismissFolderCling(View v) {
-        Cling cling = (Cling) findViewById(R.id.folder_cling);
-        dismissCling(cling, Cling.FOLDER_CLING_DISMISSED_KEY, DISMISS_CLING_DURATION);
+        if (v != null && v.getTag() != null) {
+            Cling cling = (Cling) findViewById(R.id.folder_cling);
+            Boolean isLiveFolder = (Boolean) v.getTag();
+            String key = null;
+            if (isLiveFolder) {
+                key = Cling.LIVE_FOLDER_CLING_DISMISSED_KEY;
+            } else {
+                key = Cling.FOLDER_CLING_DISMISSED_KEY;
+            }
+            dismissCling(cling, key, DISMISS_CLING_DURATION);
+        }
     }
 
     public boolean preferencesChanged() {