From a997ac26664befbd0d5b172e36ef9e8b2c63b435 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 27 Oct 2010 18:10:55 -0700
Subject: [PATCH] Setting correct active page when shrinking

Bug: 3130373

Change-Id: I5fa8772bd557b828aaac0d6433f1ff148b0d9f57
---
 src/com/android/launcher2/Workspace.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index e37907c7a5..5a31e9bc22 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