commit 5ae74b7fa6f962d2732c32b3cd4c180ae58fd866
author Yigit Boyar <yboyar@google.com> Wed Mar 02 00:36:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 02 00:36:50 2016 +0000
tree 27c29c6ff66d2ab7c62adb5bcd222057d14954a8
parent 7f2b6e2a8492d2b751f1695a747aef5f53d30d8c
parent 418d0cf5c997491be8cfeb509e35c412dd31409d

Merge "Check if item is selectable before calling on click" into nyc-dev

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 496f7ee..d2aef0a 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -3078,7 +3078,8 @@
             final int motionPosition = mClickMotionPosition;
             if (adapter != null && mItemCount > 0 &&
                     motionPosition != INVALID_POSITION &&
-                    motionPosition < adapter.getCount() && sameWindow()) {
+                    motionPosition < adapter.getCount() && sameWindow() &&
+                    adapter.isEnabled(motionPosition)) {
                 final View view = getChildAt(motionPosition - mFirstPosition);
                 // If there is no view, something bad happened (the view scrolled off the
                 // screen, etc.) and we should cancel the click