diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-12 18:08:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-12 18:08:52 +0000 |
| commit | c66db32d3b25fafbc67a7c846ec76d09b3ef8d42 (patch) | |
| tree | f13b6a6cdee88b6ccf06ecc396a61578d529381c /core/java/android | |
| parent | 6d44d9606ddf9d01b8a922428590ba06bb073031 (diff) | |
| parent | fc14e37a8b5689792084c39ec0d7b02b757c3ca1 (diff) | |
Merge "Fix consumption multiplier" into sc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 23915e06335a..105c714930a2 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -762,11 +762,11 @@ public class HorizontalScrollView extends FrameLayout { if (canOverscroll) { int consumed = 0; if (deltaX < 0 && mEdgeGlowRight.getDistance() != 0f) { - consumed = Math.round(getHeight() + consumed = Math.round(getWidth() * mEdgeGlowRight.onPullDistance((float) deltaX / getWidth(), displacement)); } else if (deltaX > 0 && mEdgeGlowLeft.getDistance() != 0f) { - consumed = Math.round(-getHeight() + consumed = Math.round(-getWidth() * mEdgeGlowLeft.onPullDistance((float) -deltaX / getWidth(), 1 - displacement)); } |