diff options
| author | Adam Powell <adamp@google.com> | 2011-03-01 15:41:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-01 15:41:58 -0800 |
| commit | 549d2b15b5374e728f379739a92e382bdbaf7eaf (patch) | |
| tree | 78543322ce779def12d7e17177953937ecc9fe26 /core | |
| parent | e0d23e6fdc095f4aff11817e41f6c07a36d44fff (diff) | |
| parent | 498e43dd8e0314e1147321bef57d4fdd82cb5284 (diff) | |
| download | frameworks_base-549d2b15b5374e728f379739a92e382bdbaf7eaf.zip frameworks_base-549d2b15b5374e728f379739a92e382bdbaf7eaf.tar.gz frameworks_base-549d2b15b5374e728f379739a92e382bdbaf7eaf.tar.bz2 | |
Merge "Fix bug 3501411 - ListView should ignore "up" events outside of its view"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 5a4bd04..2925632 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -3018,7 +3018,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te case TOUCH_MODE_DONE_WAITING: final int motionPosition = mMotionPosition; final View child = getChildAt(motionPosition - mFirstPosition); - if (child != null && !child.hasFocusable()) { + + final float x = ev.getX(); + final boolean inList = x > mListPadding.left && x < getWidth() - mListPadding.right; + + if (child != null && !child.hasFocusable() && inList) { if (mTouchMode != TOUCH_MODE_DOWN) { child.setPressed(false); } |