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

am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev

Browse Source 
* commit 'e74dff14dc6e075e372aeedb6610243c28884610':
  Use correct row/column order in list and grid CollectionItems
This commit is contained in:
Alan Viverette
2014-09-09 20:04:58 +00:00
committed by Android Git Automerger
parent 2b775fa045 b505298489
commit c6a76344b1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/GridView.java
View File

@@ -2356,7 +2356,7 @@ public class GridView extends AbsListView {
final int rowsCount = getCount() / columnsCount;
final int selectionMode = getSelectionModeForAccessibility();
final CollectionInfo collectionInfo = CollectionInfo.obtain(
columnsCount, rowsCount, false, selectionMode);
rowsCount, columnsCount, false, selectionMode);
info.setCollectionInfo(collectionInfo);
}
@@ -2385,7 +2385,7 @@ public class GridView extends AbsListView {
final boolean isHeading = lp != null && lp.viewType != ITEM_VIEW_TYPE_HEADER_OR_FOOTER;
final boolean isSelected = isItemChecked(position);
final CollectionItemInfo itemInfo = CollectionItemInfo.obtain(
column, 1, row, 1, isHeading, isSelected);
row, 1, column, 1, isHeading, isSelected);
info.setCollectionItemInfo(itemInfo);
}
}

7
core/java/android/widget/ListView.java
View File

@@ -3882,9 +3882,10 @@ public class ListView extends AbsListView {
super.onInitializeAccessibilityNodeInfo(info);
info.setClassName(ListView.class.getName());
final int count = getCount();
final int rowsCount = getCount();
final int selectionMode = getSelectionModeForAccessibility();
final CollectionInfo collectionInfo = CollectionInfo.obtain(1, count, false, selectionMode);
final CollectionInfo collectionInfo = CollectionInfo.obtain(
rowsCount, 1, false, selectionMode);
info.setCollectionInfo(collectionInfo);
}
@@ -3897,7 +3898,7 @@ public class ListView extends AbsListView {
final boolean isHeading = lp != null && lp.viewType != ITEM_VIEW_TYPE_HEADER_OR_FOOTER;
final boolean isSelected = isItemChecked(position);
final CollectionItemInfo itemInfo = CollectionItemInfo.obtain(
0, 1, position, 1, isHeading, isSelected);
position, 1, 0, 1, isHeading, isSelected);
info.setCollectionItemInfo(itemInfo);
}
}