Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
George Mount
2021-04-29 15:21:51 +00:00
committed by Android (Google) Code Review
parent c8a0871269 109e474959
commit a4b222f48d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/HorizontalScrollView.java
View File

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

3
core/java/android/widget/ScrollView.java
View File

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