summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2019-10-07 21:08:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-10-07 21:08:34 +0000
commit9788183962f33b734e60f51c047eaceae713beaa (patch)
tree6ca504654a260395a679e1390f330f9f8fa91886 /src/com
parent4f56803bd0a1b483aa3696517673ee7c0abd7e66 (diff)
parentaf33f2c9d4063c2ad95a92777cbd5e66d81d3fab (diff)
downloadandroid_packages_apps_Trebuchet-9788183962f33b734e60f51c047eaceae713beaa.tar.gz
android_packages_apps_Trebuchet-9788183962f33b734e60f51c047eaceae713beaa.tar.bz2
android_packages_apps_Trebuchet-9788183962f33b734e60f51c047eaceae713beaa.zip
Merge "Fix quickswitch flickers/ignored swipes" into ub-launcher3-qt-future-dev
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/PagedView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 5c790f379..ff2b40038 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1088,7 +1088,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
if (mFreeScroll) {
setCurrentPage(getNextPage());
} else if (wasFreeScroll) {
- snapToPage(getNextPage());
+ if (getScrollForPage(getNextPage()) != getScrollX()) {
+ snapToPage(getNextPage());
+ }
}
}