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

2019-03-05 21:32:40 +00:00
parent 111213b0f8 1942d5a54a
commit e09f47cd1f
1 changed files with 2 additions and 1 deletions
@@ -1027,7 +1027,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
        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();
    }