diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-04-02 03:46:50 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-04-02 04:39:16 -0700 |
| commit | 4ff7d79ddcee0a95fe6e7458731decd694b91d03 (patch) | |
| tree | f536570b8ba2d329e46175627c0ff6b791c7d2a2 /src/com/android/launcher2/Workspace.java | |
| parent | 0ba38df8a4af98daa535a57ec6c6ecac69b10343 (diff) | |
| download | android_packages_apps_Trebuchet-4ff7d79ddcee0a95fe6e7458731decd694b91d03.tar.gz android_packages_apps_Trebuchet-4ff7d79ddcee0a95fe6e7458731decd694b91d03.tar.bz2 android_packages_apps_Trebuchet-4ff7d79ddcee0a95fe6e7458731decd694b91d03.zip | |
Show side pages when exiting spring-loaded mode
Bug: 6132598
Change-Id: I2bf9025b7ac66d020522448b003905cb37c87587
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 06e0185c5..fc4916187 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1568,6 +1568,7 @@ public class Workspace extends SmoothPagedView final State oldState = mState; final boolean oldStateIsNormal = (oldState == State.NORMAL); + final boolean oldStateIsSpringLoaded = (oldState == State.SPRING_LOADED); final boolean oldStateIsSmall = (oldState == State.SMALL); mState = state; final boolean stateIsNormal = (state == State.NORMAL); @@ -1608,8 +1609,9 @@ public class Workspace extends SmoothPagedView if ((oldStateIsSmall && stateIsNormal) || (oldStateIsNormal && stateIsSmall)) { // To/from workspace - only show the current page unless the transition is not - // animated and the animation end callback below doesn't run - if (i == mCurrentPage || !animated) { + // animated and the animation end callback below doesn't run; + // or, if we're in spring-loaded mode + if (i == mCurrentPage || !animated || oldStateIsSpringLoaded) { finalAlpha = 1f; finalAlphaMultiplierValue = 0f; } else { |