summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-12-04 16:09:07 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:21 -0700
commitd756744629f839171b9e4d980e95639b8b5404b6 (patch)
treefad68c7618d2133bb57721f1b6f3e8f90229f406 /src
parent46e672ab1101ea33521b5a92e1f264a3e7b0b5de (diff)
downloadandroid_packages_apps_Trebuchet-d756744629f839171b9e4d980e95639b8b5404b6.tar.gz
android_packages_apps_Trebuchet-d756744629f839171b9e4d980e95639b8b5404b6.tar.bz2
android_packages_apps_Trebuchet-d756744629f839171b9e4d980e95639b8b5404b6.zip
Fix page jumping regression in overview mode (issue 12003672)
Change-Id: I4315d4e97c8df4db25e2d70be759b94a0348d644
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/PagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 9c9a514f1..8d4a0adaa 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1499,7 +1499,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
if (finishedScrolling) {
mTouchState = TOUCH_STATE_REST;
- if (!mScroller.isFinished()) {
+ if (!mScroller.isFinished() && !mFreeScroll) {
setCurrentPage(getNextPage());
pageEndMoving();
}