Setting correct active page when shrinking

Bug: 3130373

Change-Id: I5fa8772bd557b828aaac0d6433f1ff148b0d9f57

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index e37907c..5a31e9b 100644 (file)
--- 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