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

Commit 10a96d83 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

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

parents 0d734038 d8dc7601

core/java/android/widget/ScrollView.java

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

            }