summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-01-16 06:46:20 -0800
committerMichael Jurka <mikejurka@google.com>2012-01-17 12:12:18 -0800
commitdd6c09123c2341a51fb285936cfffef48c594356 (patch)
tree6714ff2a5ab428af7558e12b5151d27a5331e2d3 /src
parente3517d01ecb844b498d5862df07bc2177861806a (diff)
downloadandroid_packages_apps_Trebuchet-dd6c09123c2341a51fb285936cfffef48c594356.tar.gz
android_packages_apps_Trebuchet-dd6c09123c2341a51fb285936cfffef48c594356.tar.bz2
android_packages_apps_Trebuchet-dd6c09123c2341a51fb285936cfffef48c594356.zip
Fix occasional odd scrolling behavior
Change-Id: I4cbcd17ab0bc2212d9591098d9aac6ca3ce6ed7d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/PagedView.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index c72fdccd8..2edfb34ea 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -292,6 +292,7 @@ public abstract class PagedView extends ViewGroup {
int newX = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
scrollTo(newX, 0);
mScroller.setFinalX(newX);
+ mScroller.forceFinished(true);
}
/**
@@ -602,9 +603,7 @@ public abstract class PagedView extends ViewGroup {
if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) {
setHorizontalScrollBarEnabled(false);
- int newX = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
- scrollTo(newX, 0);
- mScroller.setFinalX(newX);
+ updateCurrentPageScroll();
setHorizontalScrollBarEnabled(true);
mFirstLayout = false;
}