commit 3384c7be3cf735f68a90d835627350fa48b94d48
author Adam Cohen <adamcohen@google.com> Sun Jul 17 15:48:21 2011 -0700
committer Adam Cohen <adamcohen@google.com> Sun Jul 17 15:49:05 2011 -0700
tree 7cf390fb430b93f6a00d1813ed5d1cb6b3b2a7fa
parent 35e7e64d4b98e42c760e5e91489b7014a6ba9073

Fixing bug where you can't switch pages in springloaded

-> Fix bug 5033543
-> Also, bug 4988105 appears to no longer be an issue

Change-Id: Iffdcafb6d8b471eb18521c160b5a8f438b5cef93

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index ec088d1..c5c9c28 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1187,7 +1187,7 @@
     }
 
     public boolean isSmall() {
-        return mState == State.SMALL;
+        return mState == State.SMALL || mState == State.SPRING_LOADED;
     }
 
     void enableChildrenCache(int fromPage, int toPage) {
@@ -1631,8 +1631,9 @@
             if (springLoaded) {
                 finalScaleFactor = mSpringLoadedShrinkFactor;
                 finalBackgroundAlpha = 1.0f;
+                mState = State.SPRING_LOADED;
             } else {
-                mState = springLoaded ? State.SPRING_LOADED : State.NORMAL;
+                mState = State.NORMAL;
             }
             if (mAnimator != null) {
                 mAnimator.cancel();