commit d8a1b5c3663bcd2b1780ed64a623b21ff49ec07c
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 16 16:48:14 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 16 16:48:14 2021 +0000
tree 4ee228f43a4a20c4e89dcd5848178bbbdd0e1767
parent a6c4b66b7f792f750e9e3a193d1c51e5bc0fd804
parent f6e31b1d219374fdf8e036988075cd0c7ec4daaa

Merge "Fix overview scroll triggering haptics on swipe up gesture" into sc-v2-dev

src/com/android/launcher3/PagedView.java

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;