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

Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2014-12-16 18:01:02 +00:00
committed by Android (Google) Code Review
parent f1f179a765 f0af0ea33b
commit 67af29f6d6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/widget/ResolverDrawerLayout.java
View File

@@ -217,8 +217,9 @@ public class ResolverDrawerLayout extends ViewGroup {
mInitialTouchX = x; mInitialTouchX = x;
mInitialTouchY = mLastTouchY = y; mInitialTouchY = mLastTouchY = y;
mActivePointerId = ev.getPointerId(0); mActivePointerId = ev.getPointerId(0);
mIsDragging = findChildUnder(mInitialTouchX, mInitialTouchY) != null; final boolean hitView = findChildUnder(mInitialTouchX, mInitialTouchY) != null;
handled = (!mIsDragging && mOnDismissedListener != null) || mCollapsibleHeight > 0; handled = (!hitView && mOnDismissedListener != null) || mCollapsibleHeight > 0;
mIsDragging = hitView && handled;
abortAnimation(); abortAnimation();
} }
break; break;