summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-06-18 23:04:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-18 23:04:57 +0000
commit3bd876ba906e2df5873d1bdada0342a145999aef (patch)
tree2793f8b3f9c70a011b9c56c14c2947832954f657 /src
parent01a4c80c40844808d1b629892eba8c3c1bb202b3 (diff)
parent312209b01ae088a5e747687fbff2b519d78c2714 (diff)
downloadandroid_packages_apps_Trebuchet-3bd876ba906e2df5873d1bdada0342a145999aef.tar.gz
android_packages_apps_Trebuchet-3bd876ba906e2df5873d1bdada0342a145999aef.tar.bz2
android_packages_apps_Trebuchet-3bd876ba906e2df5873d1bdada0342a145999aef.zip
Merge "Set mNextPage after springBack when overscrolling" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/PagedView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 80e17c9ff..dfa3e1bee 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1204,6 +1204,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
if (((initialScrollX >= mMaxScrollX) && (isVelocityXLeft || !isFling)) ||
((initialScrollX <= mMinScrollX) && (!isVelocityXLeft || !isFling))) {
mScroller.springBack(getScrollX(), mMinScrollX, mMaxScrollX);
+ mNextPage = getPageNearestToCenterOfScreen();
} else {
mScroller.setInterpolator(mDefaultInterpolator);
mScroller.fling(initialScrollX, -velocityX,