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

Commit aa1a94da authored by Michael Wright's avatar Michael Wright
Browse files

Make KEYCODE_SPACE a confirm key. 

By default space should "click" the focused item. This behavior also
applies to GridView and ListView if the items are clickable, but will
continue the previous behavior of scrolling if it's just a list of
items you can't really interact with.

Change-Id: Ic3a0334614d1dc68ff98bc4b1fb1ae2f961f71af
parent 8d19ad44

core/java/android/view/KeyEvent.java

+1 −0
Original line number Diff line number Diff line
@@ -1779,6 +1779,7 @@ public class KeyEvent extends InputEvent implements Parcelable { 
        switch (keyCode) {

            case KeyEvent.KEYCODE_DPAD_CENTER:

            case KeyEvent.KEYCODE_ENTER:

            case KeyEvent.KEYCODE_SPACE:

                return true;

            default:

                return false;

core/java/android/view/View.java

+2 −2
Original line number Diff line number Diff line
@@ -10173,8 +10173,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    /**

     * Default implementation of {@link KeyEvent.Callback#onKeyUp(int, KeyEvent)

     * KeyEvent.Callback.onKeyUp()}: perform clicking of the view

     * when {@link KeyEvent#KEYCODE_DPAD_CENTER} or

     * {@link KeyEvent#KEYCODE_ENTER} is released.

     * when {@link KeyEvent#KEYCODE_DPAD_CENTER}, {@link KeyEvent#KEYCODE_ENTER}

     * or {@link KeyEvent#KEYCODE_SPACE} is released.

     * <p>Key presses in software keyboards will generally NOT trigger this listener,

     * although some may elect to do so in some situations. Do not rely on this to

     * catch software key presses.

core/java/android/widget/GridView.java

+9 −23
Original line number Diff line number Diff line
@@ -1643,8 +1643,16 @@ public class GridView extends AbsListView { 


        boolean handled = false;

        int action = event.getAction();

        if (KeyEvent.isConfirmKey(keyCode)

                && event.hasNoModifiers() && action == KeyEvent.ACTION_UP) {

            handled = resurrectSelectionIfNeeded();

            if (!handled && event.getRepeatCount() == 0 && getChildCount() > 0) {

                keyPressed();

                handled = true;

            }

        }



        if (action != KeyEvent.ACTION_UP) {

        if (!handled && action != KeyEvent.ACTION_UP) {

            switch (keyCode) {

                case KeyEvent.KEYCODE_DPAD_LEFT:

                    if (event.hasNoModifiers()) {
@@ -1674,28 +1682,6 @@ public class GridView extends AbsListView { 
                    }

                    break;



                case KeyEvent.KEYCODE_DPAD_CENTER:

                case KeyEvent.KEYCODE_ENTER:

                    if (event.hasNoModifiers()) {

                        handled = resurrectSelectionIfNeeded();

                        if (!handled

                                && event.getRepeatCount() == 0 && getChildCount() > 0) {

                            keyPressed();

                            handled = true;

                        }

                    }

                    break;



                case KeyEvent.KEYCODE_SPACE:

                    if (mPopup == null || !mPopup.isShowing()) {

                        if (event.hasNoModifiers()) {

                            handled = resurrectSelectionIfNeeded() || pageScroll(FOCUS_DOWN);

                        } else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) {

                            handled = resurrectSelectionIfNeeded() || pageScroll(FOCUS_UP);

                        }

                    }

                    break;



                case KeyEvent.KEYCODE_PAGE_UP:

                    if (event.hasNoModifiers()) {

                        handled = resurrectSelectionIfNeeded() || pageScroll(FOCUS_UP);

core/java/android/widget/ListView.java

+10 −24
Original line number Diff line number Diff line
@@ -2180,8 +2180,17 @@ public class ListView extends AbsListView { 


        boolean handled = false;

        int action = event.getAction();

        if (KeyEvent.isConfirmKey(keyCode)

                && event.hasNoModifiers() && action == KeyEvent.ACTION_UP) {

            handled = resurrectSelectionIfNeeded();

            if (!handled && event.getRepeatCount() == 0 && getChildCount() > 0) {

                keyPressed();

                handled = true;

            }

        }





        if (action != KeyEvent.ACTION_UP) {

        if (!handled && action != KeyEvent.ACTION_UP) {

            switch (keyCode) {

            case KeyEvent.KEYCODE_DPAD_UP:

                if (event.hasNoModifiers()) {
@@ -2229,29 +2238,6 @@ public class ListView extends AbsListView { 
                }

                break;



            case KeyEvent.KEYCODE_DPAD_CENTER:

            case KeyEvent.KEYCODE_ENTER:

                if (event.hasNoModifiers()) {

                    handled = resurrectSelectionIfNeeded();

                    if (!handled

                            && event.getRepeatCount() == 0 && getChildCount() > 0) {

                        keyPressed();

                        handled = true;

                    }

                }

                break;



            case KeyEvent.KEYCODE_SPACE:

                if (mPopup == null || !mPopup.isShowing()) {

                    if (event.hasNoModifiers()) {

                        handled = resurrectSelectionIfNeeded() || pageScroll(FOCUS_DOWN);

                    } else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) {

                        handled = resurrectSelectionIfNeeded() || pageScroll(FOCUS_UP);

                    }

                    handled = true;

                }

                break;



            case KeyEvent.KEYCODE_PAGE_UP:

                if (event.hasNoModifiers()) {

                    handled = resurrectSelectionIfNeeded() || pageScroll(FOCUS_UP);