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

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

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

parents c8a08712 109e4749

core/java/android/widget/HorizontalScrollView.java

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

                if (getChildCount() == 0) {

                    return false;

                    return false;

                }

                }

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

                if (!mScroller.isFinished()) {

                        || !mEdgeGlowLeft.isFinished())) {

                    final ViewParent parent = getParent();

                    final ViewParent parent = getParent();

                    if (parent != null) {

                    if (parent != null) {

                        parent.requestDisallowInterceptTouchEvent(true);

                        parent.requestDisallowInterceptTouchEvent(true);

core/java/android/widget/ScrollView.java

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

                if (getChildCount() == 0) {

                    return false;

                    return false;

                }

                }

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

                if (!mScroller.isFinished()) {

                        || !mEdgeGlowBottom.isFinished())) {

                    final ViewParent parent = getParent();

                    final ViewParent parent = getParent();

                    if (parent != null) {

                    if (parent != null) {

                        parent.requestDisallowInterceptTouchEvent(true);

                        parent.requestDisallowInterceptTouchEvent(true);