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

Commit eff3df4d authored by George Mount's avatar George Mount Committed by Automerger Merge Worker
Browse files

Merge "Fix for ScrollView absorbing fling stretch" into udc-dev am: 10a96d83 am: aaec7718 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23920040



Change-Id: I8a32da5165030e66ee009997ef27dcfed377552a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13030fc0 aaec7718

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();

            }