diff options
author | Michael Jurka <mikejurka@google.com> | 2010-10-27 18:10:55 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-10-29 12:18:10 -0700 |
commit | a997ac26664befbd0d5b172e36ef9e8b2c63b435 (patch) | |
tree | d488fb5f7a3917ef4520e0c341eee430d0ba7dbe /src | |
parent | 55cef262f97749300c2f6e764da0b00cbcb78879 (diff) | |
download | android_packages_apps_Trebuchet-a997ac26664befbd0d5b172e36ef9e8b2c63b435.tar.gz android_packages_apps_Trebuchet-a997ac26664befbd0d5b172e36ef9e8b2c63b435.tar.bz2 android_packages_apps_Trebuchet-a997ac26664befbd0d5b172e36ef9e8b2c63b435.zip |
Setting correct active page when shrinking
Bug: 3130373
Change-Id: I5fa8772bd557b828aaac0d6433f1ff148b0d9f57
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index e37907c7a..5a31e9bc2 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -707,7 +707,7 @@ public class Workspace extends SmoothPagedView mShrunkenState = shrinkPosition; // Stop any scrolling, move to the current page right away - setCurrentPage(mCurrentPage); + setCurrentPage((mNextPage != INVALID_PAGE) ? mNextPage : mCurrentPage); updateWhichPagesAcceptDrops(mShrunkenState); // we intercept and reject all touch events when we're small, so be sure to reset the state |