From 77c180a5137348022fce388930a9781863f83e74 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Mon, 8 Sep 2014 15:30:34 -0700 Subject: [PATCH] Use correct row/column order in list and grid CollectionItems BUG: 17427260 Change-Id: Ie90767100bc38fa903173ae150b9807203230020 --- core/java/android/widget/GridView.java | 4 ++-- core/java/android/widget/ListView.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index d263625f73bea..efd6fc0f0fd1f 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -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); } } diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 1368cd38869ad..2e9858c032686 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -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); } }