commit 20f7111c73692e397d2aae746c9bdf9aec8711da
author Winson Chung <winsonc@google.com> Wed Apr 06 14:22:04 2011 -0700
committer Winson Chung <winsonc@google.com> Thu Apr 07 11:21:02 2011 -0700
tree fe8d5001a46f11c7a9d5596a5bb9250458bac62e
parent d92e741ca67c58c4be01a64940847feafe26a4b1

Making mini workspaces disappear if drag from AllApps fails.

Change-Id: Ia02e441d48a041e336b64190d7813f6b35d6dd94

src/com/android/launcher2/AllAppsPagedView.java

diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java
index 3924c57..c05fe75 100644
--- a/src/com/android/launcher2/AllAppsPagedView.java
+++ b/src/com/android/launcher2/AllAppsPagedView.java
@@ -66,6 +66,7 @@
     private boolean mAllowHardwareLayerCreation;
 
     private int mPageContentWidth;
+    private boolean mHasMadeSuccessfulDrop;
 
     public AllAppsPagedView(Context context) {
         this(context, null);
@@ -138,6 +139,10 @@
         }
     }
 
+    void resetSuccessfulDropFlag() {
+        mHasMadeSuccessfulDrop = false;
+    }
+
     @Override
     public void zoom(float zoom, boolean animate) {
         mZoom = zoom;
@@ -322,6 +327,12 @@
         tearDownDragMode();
         mLauncher.getWorkspace().onDragStopped(success);
         mLauncher.unlockScreenOrientation();
+
+        if (!success && !mHasMadeSuccessfulDrop) {
+            mLauncher.getWorkspace().shrink(Workspace.ShrinkState.BOTTOM_HIDDEN);
+        } else {
+            mHasMadeSuccessfulDrop |= success;
+        }
     }
 
     int getPageContentWidth() {