Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I67d080ab,Ia3d7a5ad

Browse Source 
* changes:
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.
This commit is contained in:
Svetoslav Ganov
2011-10-11 11:30:45 -07:00
committed by Android (Google) Code Review
parent 384bf04a38 b2a9e21672
commit 0c9698aca5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/AdapterView.java
View File

@@ -922,15 +922,20 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
if (selectedView != null) {
event.setEnabled(selectedView.isEnabled());
}
event.setCurrentItemIndex(getSelectedItemPosition());
event.setFromIndex(getFirstVisiblePosition());
event.setToIndex(getLastVisiblePosition());
event.setItemCount(getAdapter().getCount());
}
private boolean isScrollableForAccessibility() {
final int itemCount = getAdapter().getCount();
return itemCount > 0
&& (getFirstVisiblePosition() > 0 || getLastVisiblePosition() < itemCount - 1);
T adapter = getAdapter();
if (adapter != null) {
final int itemCount = adapter.getCount();
return itemCount > 0
&& (getFirstVisiblePosition() > 0 || getLastVisiblePosition() < itemCount - 1);
}
return false;
}
@Override