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

Commit fb07349c authored by Jeff Brown's avatar Jeff Brown
Browse files

Make View onKeyUp symmetric with onKeyDown. 

Properly use KeyEvent.isConfirmKey() in both methods.

Change-Id: Id87158f2163f75af20350dc445df6a59f7190752
parent 23a5f44c

core/java/android/view/View.java

+12 −19
Original line number Diff line number Diff line
@@ -8008,7 +8008,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    public boolean onKeyDown(int keyCode, KeyEvent event) {

        boolean result = false;













        if (KeyEvent.isConfirmKey(event.getKeyCode())) {













        if (KeyEvent.isConfirmKey(keyCode)) {















            if ((mViewFlags & ENABLED_MASK) == DISABLED) {















                return true;















            }










@@ -8050,11 +8050,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * @param event   The KeyEvent object that defines the button action.















     */















    public boolean onKeyUp(int keyCode, KeyEvent event) {













        boolean result = false;

























        switch (keyCode) {













            case KeyEvent.KEYCODE_DPAD_CENTER:













            case KeyEvent.KEYCODE_ENTER: {













        if (KeyEvent.isConfirmKey(keyCode)) {















            if ((mViewFlags & ENABLED_MASK) == DISABLED) {















                return true;















            }









@@ -8064,14 +8060,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                if (!mHasPerformedLongPress) {















                    // This is a tap, so remove the longpress check















                    removeLongPressCallback();

























                        result = performClick();













                    return performClick();















                }















            }













                break;















        }













        }













        return result;













        return false;















    }





























    /**