commit e09f47cd1f888a4aa63895dd7264c253e8dcbbc7
author Winson Chung <winsonc@google.com> Tue Mar 05 21:32:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 05 21:32:40 2019 +0000
tree e6f6a6432ff5d711928872770b8a340bfde391d0
parent 111213b0f8e2293ec032dc52436dc3c159d5c64b
parent 1942d5a54af945d94919ee55bc46175e5885b306

Merge "Fix issue with flashing on overscroll" into ub-launcher3-master

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 00da6fa..7fa1aa0 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1027,7 +1027,8 @@
         if (overScrollAmount < 0) {
             super.scrollTo(overScrollAmount, getScrollY());
         } else {
-            super.scrollTo(mMaxScrollX + overScrollAmount, getScrollY());
+            int x = Math.max(0, Math.min(getScrollX(), mMaxScrollX));
+            super.scrollTo(x + overScrollAmount, getScrollY());
         }
         invalidate();
     }