summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author George Mount <mount@google.com> 2023-07-05 14:46:24 -0700
committer George Mount <mount@google.com> 2023-07-06 18:57:46 +0000
commitd8dc760158fe86f314b1c78f596a7a3a18f34bd4 (patch)
tree1d3f12fd254c6584146d4dc9a13333e3754aa2c0
parent46354c7d8e56a086b409b040d3bb32e8ecd6ee51 (diff)
Fix for ScrollView absorbing fling stretch
Bug: 288270962 When a fling was absorbed, it wasn't releasing the absorbed stretch. This CL fixes that. Test: new tests Change-Id: Id328cb63911eed1644ed2d5e0ee6f2cdc5d4cce8
-rw-r--r--core/java/android/widget/ScrollView.java2
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();
}