Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5052984 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

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

parents 2f439763 77c180a5

core/java/android/widget/GridView.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }

}

core/java/android/widget/ListView.java

+4 −3
Original line number Diff line number Diff line
@@ -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);

    }

}