Merge "AbsListView does not populate accessibility events correctly."

sganov · Android (Google) Code Review · commit 6436876156b0 · 2011-09-06T12:52:06.000-07:00
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
@@ -926,8 +926,10 @@ public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         }
         event.setItemCount(getCount());
         event.setCurrentItemIndex(getSelectedItemPosition());
-        event.setFromIndex(mFirstPosition);
-        event.setToIndex(mFirstPosition + getChildCount());
+        if (getChildCount() > 0) {
+            event.setFromIndex(getFirstVisiblePosition());
+            event.setToIndex(getLastVisiblePosition());
+        }
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -926,8 +926,10 @@ public void onInitializeAccessibilityEvent(AccessibilityEvent event) {`
`926`	`926`	`}`
`927`	`927`	`event.setItemCount(getCount());`
`928`	`928`	`event.setCurrentItemIndex(getSelectedItemPosition());`
`929`		`- event.setFromIndex(mFirstPosition);`
`930`		`- event.setToIndex(mFirstPosition + getChildCount());`
	`929`	`+ if (getChildCount() > 0) {`
	`930`	`+ event.setFromIndex(getFirstVisiblePosition());`
	`931`	`+ event.setToIndex(getLastVisiblePosition());`
	`932`	`+ }`
`931`	`933`	`}`
`932`	`934`
`933`	`935`	`@Override`