| commit | 49584c3412b5ab5383f6bb7da597772d4da830c2 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 16 17:03:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 16 17:03:44 2021 +0000 |
| tree | 2540a228f35bbaaeb3bd349cb2ce8e4323d2a8c7 | |
| parent | a8a8c75bd75e84fcaf2728ff70ab241b8fa3736e [diff] | |
| parent | d8a1b5c3663bcd2b1780ed64a623b21ff49ec07c [diff] |
Merge "Fix overview scroll triggering haptics on swipe up gesture" into sc-v2-dev am: d8a1b5c366 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16214589 Change-Id: I8b3a32fd3c115a4f4276add4450a7f07081a1336
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 523ac72..cefadf7 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java
@@ -1721,6 +1721,10 @@ @Override protected void onScrollChanged(int l, int t, int oldl, int oldt) { + if (mScroller.isFinished()) { + // This was not caused by the scroller, skip it. + return; + } int newDestinationPage = getDestinationPage(); if (newDestinationPage >= 0 && newDestinationPage != mCurrentScrollOverPage) { mCurrentScrollOverPage = newDestinationPage;