summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2019-02-22 15:07:30 -0800
committerWinson Chung <winsonc@google.com>2019-02-25 18:56:21 +0000
commit1de3c5078caf7d8acd33d5e45be2e36917815324 (patch)
treeb48472cca73d00bc3de162cfb456d235590066f6 /src
parentf96d74017e7ede43451726dbcebd778256188492 (diff)
downloadandroid_packages_apps_Trebuchet-1de3c5078caf7d8acd33d5e45be2e36917815324.tar.gz
android_packages_apps_Trebuchet-1de3c5078caf7d8acd33d5e45be2e36917815324.tar.bz2
android_packages_apps_Trebuchet-1de3c5078caf7d8acd33d5e45be2e36917815324.zip
Fix small issue with overscroll not being dampened on the left edge.
Change-Id: I113425e6bae2ff6f6f143526a7e06363fb8d4320
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/PagedView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 4b7d8b456..00da6fac8 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1024,8 +1024,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
return;
}
- if (amount < 0) {
- super.scrollTo(amount, getScrollY());
+ if (overScrollAmount < 0) {
+ super.scrollTo(overScrollAmount, getScrollY());
} else {
super.scrollTo(mMaxScrollX + overScrollAmount, getScrollY());
}