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

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

Merge "Allow intercept touch event while animating edge glow." into sc-dev am: a4b222f4 

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

Change-Id: I9ab35750185892bd560aacaf7bdf26faee7793d7
parents 6ebbcabe a4b222f4

core/java/android/widget/HorizontalScrollView.java

+1 −2
Original line number Diff line number Diff line
@@ -706,8 +706,7 @@ public class HorizontalScrollView extends FrameLayout { 
                if (getChildCount() == 0) {

                    return false;

                }

                if ((mIsBeingDragged = !mScroller.isFinished() || !mEdgeGlowRight.isFinished()

                        || !mEdgeGlowLeft.isFinished())) {

                if (!mScroller.isFinished()) {

                    final ViewParent parent = getParent();

                    if (parent != null) {

                        parent.requestDisallowInterceptTouchEvent(true);

core/java/android/widget/ScrollView.java

+1 −2
Original line number Diff line number Diff line
@@ -763,8 +763,7 @@ public class ScrollView extends FrameLayout { 
                if (getChildCount() == 0) {

                    return false;

                }

                if ((mIsBeingDragged = !mScroller.isFinished() || !mEdgeGlowTop.isFinished()

                        || !mEdgeGlowBottom.isFinished())) {

                if (!mScroller.isFinished()) {

                    final ViewParent parent = getParent();

                    if (parent != null) {

                        parent.requestDisallowInterceptTouchEvent(true);