Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for ScrollView absorbing fling stretch" into udc-dev

Browse Source
This commit is contained in:
George Mount
2023-07-12 16:37:46 +00:00
committed by Android (Google) Code Review
parent 0d7340382a d8dc760158
commit 10a96d83b2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/ScrollView.java
View File

@@ -1550,6 +1550,7 @@ public class ScrollView extends FrameLayout {
float deltaDistance = -unconsumed * FLING_DESTRETCH_FACTOR / size; float deltaDistance = -unconsumed * FLING_DESTRETCH_FACTOR / size;
int consumed = Math.round(-size / FLING_DESTRETCH_FACTOR int consumed = Math.round(-size / FLING_DESTRETCH_FACTOR
* mEdgeGlowTop.onPullDistance(deltaDistance, 0.5f)); * mEdgeGlowTop.onPullDistance(deltaDistance, 0.5f));
mEdgeGlowTop.onRelease();
if (consumed != unconsumed) { if (consumed != unconsumed) {
mEdgeGlowTop.finish(); mEdgeGlowTop.finish();
} }
@@ -1560,6 +1561,7 @@ public class ScrollView extends FrameLayout {
float deltaDistance = unconsumed * FLING_DESTRETCH_FACTOR / size; float deltaDistance = unconsumed * FLING_DESTRETCH_FACTOR / size;
int consumed = Math.round(size / FLING_DESTRETCH_FACTOR int consumed = Math.round(size / FLING_DESTRETCH_FACTOR
* mEdgeGlowBottom.onPullDistance(deltaDistance, 0.5f)); * mEdgeGlowBottom.onPullDistance(deltaDistance, 0.5f));
mEdgeGlowBottom.onRelease();
if (consumed != unconsumed) { if (consumed != unconsumed) {
mEdgeGlowBottom.finish(); mEdgeGlowBottom.finish();
} }