Merge "Adding initial folder animation"

1 files changed, 13 insertions, 1 deletions

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index b2ec67c01..52263cf38 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2006,15 +2006,23 @@ public final class Launcher extends Activity
 
     void closeFolder(Folder folder) {
         folder.getInfo().opened = false;
+
         ViewGroup parent = (ViewGroup) folder.getParent().getParent();
         if (parent != null) {
             CellLayout cl = (CellLayout) parent;
-            cl.removeViewWithoutMarkingCells(folder);
+            if (!(folder instanceof UserFolder)) {
+                // User folders will remove themselves
+                cl.removeViewWithoutMarkingCells(folder);
+            }
             if (folder instanceof DropTarget) {
                 // Live folders aren't DropTargets.
                 mDragController.removeDropTarget((DropTarget)folder);
             }
         }
+        if (folder instanceof UserFolder) {
+            UserFolder uf = (UserFolder) folder;
+            uf.animateClosed();
+        }
         folder.onClose();
     }
 
@@ -2230,6 +2238,10 @@ public final class Launcher extends Activity
         folderInfo.opened = true;
 
         mWorkspace.addInFullScreen(openFolder, folderInfo.screen);
+        if (openFolder instanceof UserFolder) {
+            UserFolder uf = (UserFolder) openFolder;
+            uf.animateOpen();
+        }
 
         openFolder.onOpen();
     }