summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-08-12 20:47:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-12 20:47:39 +0000
commit890db42b0d4873bf3a19cd784bb7497db2add22e (patch)
treebdb38f2193bd6c8c420385b9ec59ffc32105a561 /core
parentb9b1701dca28ab70ad94ed9e0e6a0dc3913135cb (diff)
parentb339cc5bcbafbc5b9cf184c6f87b4eb466386ea6 (diff)
downloadframeworks_base-890db42b0d4873bf3a19cd784bb7497db2add22e.zip
frameworks_base-890db42b0d4873bf3a19cd784bb7497db2add22e.tar.gz
frameworks_base-890db42b0d4873bf3a19cd784bb7497db2add22e.tar.bz2
Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/AbsListView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 0ed846b..07198c7 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -3485,7 +3485,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mLastY = Integer.MIN_VALUE;
}
- if (performButtonActionOnTouchDown(ev) && (mTouchMode == TOUCH_MODE_DOWN)) {
+ if (mTouchMode == TOUCH_MODE_DOWN && mMotionPosition != INVALID_POSITION
+ && performButtonActionOnTouchDown(ev)) {
removeCallbacks(mPendingCheckForTap);
}
}