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

Commit fa28b984 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Only translate prefixed strings to keys / axes."

parents 154f8283 973efa08

core/java/android/view/KeyEvent.java

+4 −4
Original line number Diff line number Diff line
@@ -2698,11 +2698,11 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    public static int keyCodeFromString(String symbolicName) {

        if (symbolicName.startsWith(LABEL_PREFIX)) {

            symbolicName = symbolicName.substring(LABEL_PREFIX.length());

        }

            int keyCode = nativeKeyCodeFromString(symbolicName);

            if (keyCode > 0) {

                return keyCode;

            }

        }

        try {

            return Integer.parseInt(symbolicName, 10);

        } catch (NumberFormatException ex) {

core/java/android/view/MotionEvent.java

+4 −4
Original line number Diff line number Diff line
@@ -3070,11 +3070,11 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
    public static int axisFromString(String symbolicName) {

        if (symbolicName.startsWith(LABEL_PREFIX)) {

            symbolicName = symbolicName.substring(LABEL_PREFIX.length());

        }

            int axis = nativeAxisFromString(symbolicName);

            if (axis >= 0) {

                return axis;

            }

        }

        try {

            return Integer.parseInt(symbolicName, 10);

        } catch (NumberFormatException ex) {