commit c7cb26331e117fa4b3601828afbf020bd505b85d
author Michael Jurka <mikejurka@google.com> Sun Jan 16 23:08:08 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Jan 16 23:08:08 2011 -0800
tree 5614fae49b27999926e91edeee207cec8182ca93
parent 36930bd03b06ced68d83b5bf92719be46b467c01
parent 2cae845c828036e8c2a0b44f04fda51f74ffc200

am 2cae845c: am b7e0e884: Fixed bug where workspace was not visible

* commit '2cae845c828036e8c2a0b44f04fda51f74ffc200':
  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;