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

am 32230b2b: am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev

Browse Source 
* commit '32230b2bdec14f33d793f8f3c89673b648139170':
  Let host view handle long-press when using drag-to-open
This commit is contained in:
Alan Viverette
2014-12-09 00:17:44 +00:00
committed by Android Git Automerger
parent b0efde16ea 32230b2bde
commit f758af4e72
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/ListPopupWindow.java
View File

@@ -1385,7 +1385,9 @@ public class ListPopupWindow {
clearCallbacks(); clearCallbacks();
final View src = mSrc; final View src = mSrc;
if (!src.isEnabled()) { if (!src.isEnabled() || src.isLongClickable()) {
// Ignore long-press if the view is disabled or has its own
// handler.
return; return;
} }
@@ -1394,12 +1396,12 @@ public class ListPopupWindow {
} }
// Don't let the parent intercept our events. // Don't let the parent intercept our events.
mSrc.getParent().requestDisallowInterceptTouchEvent(true); src.getParent().requestDisallowInterceptTouchEvent(true);
// Make sure we cancel any ongoing source event stream. // Make sure we cancel any ongoing source event stream.
final long now = SystemClock.uptimeMillis(); final long now = SystemClock.uptimeMillis();
final MotionEvent e = MotionEvent.obtain(now, now, MotionEvent.ACTION_CANCEL, 0, 0, 0); final MotionEvent e = MotionEvent.obtain(now, now, MotionEvent.ACTION_CANCEL, 0, 0, 0);
mSrc.onTouchEvent(e); src.onTouchEvent(e);
e.recycle(); e.recycle();
mForwarding = true; mForwarding = true;