commit 76fc085d28178a5d4fb3787ede956281a2cc3179
author Adam Cohen <adamcohen@google.com> Fri Jun 17 13:26:23 2011 -0700
committer Adam Cohen <adamcohen@google.com> Tue Jun 21 18:00:21 2011 -0700
tree 98d95c5f3e069d36cea8fe699e569271a9d6750d
parent b6c2a87511aeb5b7cc2c20417503dc52a283067c

New folder visualization, renaming, staggering reorder

Change-Id: I62963d225e6ea5d2ec9d8ebc8a6d73099f5d6c7f

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index bda5591..323c527 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1728,7 +1728,12 @@
         if (mState == State.APPS_CUSTOMIZE) {
             showWorkspace(true);
         } else if (mWorkspace.getOpenFolder() != null) {
-            closeFolder();
+            Folder openFolder = mWorkspace.getOpenFolder();
+            if (openFolder.isEditingName()) {
+                openFolder.dismissEditingName();
+            } else {
+                closeFolder();
+            }
         } else if (isPreviewVisible()) {
             dismissPreview(mPreviousView);
             dismissPreview(mNextView);
@@ -1760,7 +1765,6 @@
         }
 
         folder.animateClosed();
-        folder.onClose();
     }
 
     /**