summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-12-04 16:09:07 -0800
committerAdam Cohen <adamcohen@google.com>2013-12-04 16:12:19 -0800
commit59b5c79b6ff2de83209cf1425b8924d541e97266 (patch)
treef7efe3c18d8a22ec42e62d9b12cf48b78105ceb4
parentb0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea (diff)
downloadandroid_packages_apps_Trebuchet-59b5c79b6ff2de83209cf1425b8924d541e97266.tar.gz
android_packages_apps_Trebuchet-59b5c79b6ff2de83209cf1425b8924d541e97266.tar.bz2
android_packages_apps_Trebuchet-59b5c79b6ff2de83209cf1425b8924d541e97266.zip
Fix page jumping regression in overview mode (issue 12003672)
Change-Id: I4315d4e97c8df4db25e2d70be759b94a0348d644
-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 2c7114bc5..c216f926f 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1398,7 +1398,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();
}