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

Commit 109e4749 authored Apr 26, 2021 by George Mount

Allow intercept touch event while animating edge glow.

Bug: 185906621

During overscroll animation, there is no need to call
disallowInterceptTouchEvents(). This removed the
call so that parents can intercept touch events.

Test: Ia9ac6d81a5b60222f489ea87f31ecba0c1d48cea
Test: manual testing

Change-Id: Ie5d9428d95b86d7a976c2f3c519547151a45cec5

parent 6f46df25

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