Adding initial folder animation
-Changed CellLayout/CellLayoutChildren to use padding in the more
standard way
Change-Id: I728f1b699232422be76eb29b4cf710cd5723a0aa
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 60cab8e..4981cb4 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1983,15 +1983,23 @@
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();
}
@@ -2207,6 +2215,10 @@
folderInfo.opened = true;
mWorkspace.addInFullScreen(openFolder, folderInfo.screen);
+ if (openFolder instanceof UserFolder) {
+ UserFolder uf = (UserFolder) openFolder;
+ uf.animateOpen();
+ }
openFolder.onOpen();
}