diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-07-17 15:48:21 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-07-17 15:49:05 -0700 |
| commit | 3384c7be3cf735f68a90d835627350fa48b94d48 (patch) | |
| tree | 7cf390fb430b93f6a00d1813ed5d1cb6b3b2a7fa /src/com/android/launcher2/Workspace.java | |
| parent | 35e7e64d4b98e42c760e5e91489b7014a6ba9073 (diff) | |
| download | android_packages_apps_Trebuchet-3384c7be3cf735f68a90d835627350fa48b94d48.tar.gz android_packages_apps_Trebuchet-3384c7be3cf735f68a90d835627350fa48b94d48.tar.bz2 android_packages_apps_Trebuchet-3384c7be3cf735f68a90d835627350fa48b94d48.zip | |
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
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index ec088d1ff..c5c9c282c 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1187,7 +1187,7 @@ public class Workspace extends SmoothPagedView } 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 @@ public class Workspace extends SmoothPagedView 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(); |