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

Merge "Fix consumption multiplier" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-12 18:08:52 +00:00
committed by Android (Google) Code Review
parent 6d44d9606d fc14e37a8b
commit c66db32d3b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/HorizontalScrollView.java
View File

@@ -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));
}