Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c66db32d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix consumption multiplier" into sc-dev

parents 6d44d960 fc14e37a

core/java/android/widget/HorizontalScrollView.java

+2 −2
Original line number Diff line number Diff line
@@ -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));

                        }