diff options
| author | 2023-07-12 17:41:27 +0000 | |
|---|---|---|
| committer | 2023-07-12 17:41:27 +0000 | |
| commit | 75ab2983ed9e5b64bdbb157641538fdc6624ad3d (patch) | |
| tree | ba5bdf1057bfe119cd8b55c0f51097f611a13c8e | |
| parent | 62b5da53bf5fe43f14906349dcb83e461c5865e7 (diff) | |
| parent | f927c565fd691ab1be0a0a51bb4505da4d17a9cd (diff) | |
Merge "Fix for ScrollView absorbing fling stretch" into udc-dev am: 10a96d83b2 am: f927c565fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23920040
Change-Id: I4591468787393d7e113d3dad08118d57441c8b5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index b65c1a17e26b..cb5dbe6c5618 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -1550,6 +1550,7 @@ public class ScrollView extends FrameLayout { float deltaDistance = -unconsumed * FLING_DESTRETCH_FACTOR / size; int consumed = Math.round(-size / FLING_DESTRETCH_FACTOR * mEdgeGlowTop.onPullDistance(deltaDistance, 0.5f)); + mEdgeGlowTop.onRelease(); if (consumed != unconsumed) { mEdgeGlowTop.finish(); } @@ -1560,6 +1561,7 @@ public class ScrollView extends FrameLayout { float deltaDistance = unconsumed * FLING_DESTRETCH_FACTOR / size; int consumed = Math.round(size / FLING_DESTRETCH_FACTOR * mEdgeGlowBottom.onPullDistance(deltaDistance, 0.5f)); + mEdgeGlowBottom.onRelease(); if (consumed != unconsumed) { mEdgeGlowBottom.finish(); } |