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

Commit 8c8ac812 authored by Evan Rosky's avatar Evan Rosky
Browse files

Enabled (asymmetric) tab selection in GridView 

We decided its better for tab to do something than to have no
tab navigation within GridView.

Also fixed a small bug that made backwards focus order not work
right.

Bug: 38264959
Test: Manually tested in test-app. Added basic CTS for tab keys
Change-Id: I8236deed26e6d8b8cae0130359b104af4d9a244d
parent b827c523

core/java/android/widget/GridView.java

+9 −12
Original line number Diff line number Diff line
@@ -1718,13 +1718,11 @@ public class GridView extends AbsListView { 
                    break;



                case KeyEvent.KEYCODE_TAB:

                    // XXX Sometimes it is useful to be able to TAB through the items in

                    // TODO: Sometimes it is useful to be able to TAB through the items in

                    //     a GridView sequentially.  Unfortunately this can create an

                    //     asymmetry in TAB navigation order unless the list selection

                    //     always reverts to the top or bottom when receiving TAB focus from

                    //     another widget.  Leaving this behavior disabled for now but

                    //     perhaps it should be configurable (and more comprehensive).

                    if (false) {

                    //     another widget.

                    if (event.hasNoModifiers()) {

                        handled = resurrectSelectionIfNeeded()

                                || sequenceScroll(FOCUS_FORWARD);
@@ -1732,7 +1730,6 @@ public class GridView extends AbsListView { 
                        handled = resurrectSelectionIfNeeded()

                                || sequenceScroll(FOCUS_BACKWARD);

                    }

                    }

                    break;

            }

        }
@@ -1991,7 +1988,7 @@ public class GridView extends AbsListView { 


        if (!mStackFromBottom) {

            rowStart = childIndex - (childIndex % mNumColumns);

            rowEnd = Math.max(rowStart + mNumColumns - 1, count);

            rowEnd = Math.min(rowStart + mNumColumns - 1, count);

        } else {

            rowEnd = count - 1 - (invertedIndex - (invertedIndex % mNumColumns));

            rowStart = Math.max(0, rowEnd - mNumColumns + 1);