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

Commit 1e936da2 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "Add new keycodes for the convenience of Japanese IMEs"

parents 0938ef42 b032bc03

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -153254,6 +153254,17 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_PICTSYMBOLS"

 type="int"

 transient="false"

 volatile="false"

 value="94"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PLUS"

 type="int"

 transient="false"
@@ -153430,6 +153441,17 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_SWITCH_CHARSET"

 type="int"

 transient="false"

 volatile="false"

 value="95"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SYM"

 type="int"

 transient="false"

core/java/android/view/KeyEvent.java

100644 → 100755
+5 −1
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ public class KeyEvent implements Parcelable { 
    public static final int KEYCODE_MUTE            = 91;

    public static final int KEYCODE_PAGE_UP         = 92;

    public static final int KEYCODE_PAGE_DOWN       = 93;

    public static final int KEYCODE_PICTSYMBOLS     = 94;   // switch symbol-sets (Emoji,Kao-moji)

    public static final int KEYCODE_SWITCH_CHARSET  = 95;   // switch char-sets (Kanji,Katakana)



    // NOTE: If you add a new keycode here you must also add it to:

    //  isSystem()
@@ -137,7 +139,7 @@ public class KeyEvent implements Parcelable { 
    //  those new codes.  This is intended to maintain a consistent

    //  set of key code definitions across all Android devices.

   

    private static final int LAST_KEYCODE           = KEYCODE_PAGE_DOWN;

    private static final int LAST_KEYCODE           = KEYCODE_SWITCH_CHARSET;

    

    /**

     * @deprecated There are now more than MAX_KEYCODE keycodes.
@@ -694,6 +696,8 @@ public class KeyEvent implements Parcelable { 
        case KEYCODE_CAMERA:

        case KEYCODE_FOCUS:

        case KEYCODE_SEARCH:

        case KEYCODE_PICTSYMBOLS:

        case KEYCODE_SWITCH_CHARSET:

            return true;

        default:

            return false;

core/res/res/values/attrs.xml

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -914,6 +914,8 @@ 
        <enum name="KEYCODE_MUTE" value="91" />

        <enum name="KEYCODE_PAGE_UP" value="92" />

        <enum name="KEYCODE_PAGE_DOWN" value="93" />

        <enum name="KEYCODE_PICTSYMBOLS" value="94" />

        <enum name="KEYCODE_SWITCH_CHARSET" value="95" />

    </attr>



    <!-- ***************************************************************** -->

include/ui/KeycodeLabels.h

100644 → 100755
+5 −1
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ static const KeycodeLabel KEYCODES[] = { 
    { "MUTE", 91 },

    { "PAGE_UP", 92 },

    { "PAGE_DOWN", 93 },

    { "PICTSYMBOLS", 94 },

    { "SWITCH_CHARSET", 95 },



    // NOTE: If you add a new keycode here you must also add it to:

    //   (enum KeyCode, in this file)
@@ -222,7 +224,9 @@ typedef enum KeyCode { 
    kKeyCodeForward = 90,

    kKeyCodeMute = 91,

    kKeyCodePageUp = 92,

    kKeyCodePageDown = 93

    kKeyCodePageDown = 93,

    kKeyCodePictSymbols = 94,

    kKeyCodeSwitchCharset = 95

} KeyCode;



static const KeycodeLabel FLAGS[] = {