From 109e474959d042e80fcab685146d29d8c51e8d79 Mon Sep 17 00:00:00 2001 From: George Mount Date: Mon, 26 Apr 2021 22:09:40 +0000 Subject: [PATCH] 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 --- core/java/android/widget/HorizontalScrollView.java | 3 +-- core/java/android/widget/ScrollView.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 105c714930a2d..b5a58481ae2aa 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -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); diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 65f3da79afe0f..2dd7f022ff449 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -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);