From 03929773a45a21c1ff0d4e0ae152bbad1b8585a4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 23 Feb 2011 17:07:10 -0800
Subject: Fixing issue where flinging the Customize tray would scroll to the
 incorrect page after update.

Change-Id: I654665b065ad60414286ea16f7feae5054df604c
---
 src/com/android/launcher2/CustomizePagedView.java | 9 ++++++++-
 src/com/android/launcher2/PagedView.java          | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index b9972755e..2f2cb24ab 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -1109,7 +1109,14 @@ public class CustomizePagedView extends PagedViewWithDraggableItems
         }
 
         // bound the current page
-        setCurrentPage(Math.max(0, Math.min(childCount - 1, getCurrentPage())));
+        requestLayout();
+        post(new Runnable() {
+            @Override
+            public void run() {
+                setCurrentPage(Math.max(0, Math.min(childCount - 1, getCurrentPage())));
+                forceUpdateAdjacentPagesAlpha();
+            }
+        });
     }
 
     @Override
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index cb952356b..511c960e7 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -500,6 +500,11 @@ public abstract class PagedView extends ViewGroup {
         }
     }
 
+    protected void forceUpdateAdjacentPagesAlpha() {
+        mDirtyPageAlpha = true;
+        updateAdjacentPagesAlpha();
+    }
+
     protected void updateAdjacentPagesAlpha() {
         if (mFadeInAdjacentScreens) {
             if (mDirtyPageAlpha || (mTouchState == TOUCH_STATE_SCROLLING) || !mScroller.isFinished()) {
-- 
cgit v1.2.3