diff options
| author | George Mount <mount@google.com> | 2021-04-26 22:09:40 +0000 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2021-04-28 21:47:12 +0000 |
| commit | 109e474959d042e80fcab685146d29d8c51e8d79 (patch) | |
| tree | c42313d5b09445da46ffb0631a46238d038f4bf4 /core/java/android/widget/ScrollView.java | |
| parent | 6f46df2512dc93dcdc18bb98153a2b55081ebc2f (diff) | |
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
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 65f3da79afe0..2dd7f022ff44 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); |