From eb885026ed3233d7025658135da6a40751cc2830 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 30 Apr 2020 23:27:39 -0500
Subject: [PATCH] Fix spring overscroll when there's a min scroll

Test: clear app recent apps, open Calculator, open Clock,
quick switch to Calculator and see no jump

Bug: 154815348
Change-Id: I6289d43efe5d850cb2fd807d15115c5ce38c16dd
---
 src/com/android/launcher3/PagedView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index bbdadeea0b..359190cc58 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1068,7 +1068,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
     private int getSpringOverScroll(int amount) {
         if (mScroller.isSpringing()) {
             return amount < 0
-                    ? mScroller.getCurrPos()
+                    ? mScroller.getCurrPos() - mMinScroll
                     : Math.max(0, mScroller.getCurrPos() - mMaxScroll);
         } else {
             return 0;