summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMark Lindner <mlindner@google.com>2011-06-30 16:26:51 -0700
committerJeff Brown <jeffbrown@google.com>2011-07-14 20:27:52 -0700
commita86127fe265896136d2e70273b7623e7c765fe2e (patch)
treecff7f15893d9613bab69aaf550e713ab5adcc6ad /core/java
parentda13560de2d8eddf08c0f37b181ba321f02716b4 (diff)
ListView focus bugfix.
resurrectSelection() didn't take into account disabled items (which shouldn't ever get focus). Bug: 4967915 Change-Id: I849d2d993ddf93f49108e7b867ff6d24643c07a8
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/AbsListView.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 3ca663503f78..6b8060862f32 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -4653,6 +4653,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
childrenTop += getVerticalFadingEdgeLength();
}
}
+ // Don't ever focus a disabled item.
+ if (!mAdapter.isEnabled(i)) continue;
+
if (top >= childrenTop) {
// Found a view whose top is fully visisble
selectedPos = firstPosition + i;