diff options
| author | Winson Chung <winsonc@google.com> | 2011-02-24 10:02:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-24 10:02:08 -0800 |
| commit | 760585d09f9236b4b408174f7cc380d6437d4910 (patch) | |
| tree | bffc36d92a338a9913d5818dd528bdf86b2e2773 /src/com | |
| parent | 3c38d561e6976ffc54eda61ed669870bbb8ec207 (diff) | |
| parent | 03929773a45a21c1ff0d4e0ae152bbad1b8585a4 (diff) | |
| download | android_packages_apps_Trebuchet-760585d09f9236b4b408174f7cc380d6437d4910.tar.gz android_packages_apps_Trebuchet-760585d09f9236b4b408174f7cc380d6437d4910.tar.bz2 android_packages_apps_Trebuchet-760585d09f9236b4b408174f7cc380d6437d4910.zip | |
Merge "Fixing issue where flinging the Customize tray would scroll to the incorrect page after update."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/CustomizePagedView.java | 9 | ||||
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 5 |
2 files changed, 13 insertions, 1 deletions
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 159e821d5..41521041d 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()) { |