commit 2cae845c828036e8c2a0b44f04fda51f74ffc200
author Michael Jurka <mikejurka@google.com> Sun Jan 16 18:53:03 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Jan 16 18:53:03 2011 -0800
tree f693c5ef4f02eab43ebc77a3aeeb562d2599ddf2
parent 8bea5f74499ea32dcf9775bfa62fdd9440c20f8f
parent b7e0e88412871f6582420e3eeb1552598ba8a4c1

am b7e0e884: Fixed bug where workspace was not visible

* commit 'b7e0e88412871f6582420e3eeb1552598ba8a4c1':
  Fixed bug where workspace was not visible

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 540b373..89de2da 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1439,6 +1439,7 @@
     }
 
     void unshrink(boolean animated, boolean springLoaded) {
+        mWaitingToShrink = false;
         if (mIsSmall) {
             float finalScaleFactor = 1.0f;
             float finalBackgroundAlpha = 0.0f;