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

Commit 497a92cc authored by Jeff Brown's avatar Jeff Brown
Browse files

Add keycodes and meta-key modifiers to support external keyboards. 

Added new key maps for external keyboards.  These maps are intended to
be shared across devices by inheriting the "keyboards.mk" product
makefile as part of the device's product definition.

One of the trickier changes here was to unwind some code in
MetaKeyKeyListener that assumed that only the low 8 bits of the meta key
state were actually used.  The new code abandons bitshifts in favor
of simple conditionals that are probably easier to read anyways.
The special meta key state constants used by MetaKeyKeyListener
are now (@hide) defined in KeyEvent now so as to make it clearer that they
share the same code space even if those codes are not valid for KeyEvents.

The EventHub now takes care of detecting the appropriate key layout
map and key character map when the device is added and sets system
properties accordingly.  This avoids having duplicate code in
KeyCharacterMap to probe for the appropriate key character map
although the current probing mechanism has been preserved for legacy
reasons just in case.

Added support for tracking caps lock, num lock and scroll lock and
turning their corresponding LEDs on and off as needed.

The key character map format will need to be updated to correctly support
PC style external keyboard semantics related to modifier keys.
That will come in a later change so caps lock doesn't actually do
anything right now except turn the shiny LEDs on and off...

Added a list of symbolic key names to KeyEvent and improved the toString()
output for debug diagnosis.  Having this list in a central place in the
framework also allows us to remove it from Monkey so there is one less
thing to maintain when we add new keycodes.

Bug: 2912307
Change-Id: If8c25e8d50a7c29bbf5d663c94284f5f86de5da4
parent cd9afc37

api/current.xml

+849 −90
Original line number Diff line number Diff line
@@ -195848,6 +195848,17 @@ 
<parameter name="keyCode" type="int">

</parameter>

</method>

<method name="isNumLockLatched"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isPrintingKey"

 return="boolean"

 abstract="false"
@@ -196530,6 +196541,39 @@ 
 visibility="public"

>

</method>

<method name="isCapsLockLatched"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isCtrlPressed"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isFunctionPressed"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isLongPress"

 return="boolean"

 abstract="false"
@@ -196541,6 +196585,17 @@ 
 visibility="public"

>

</method>

<method name="isMetaPressed"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isModifierKey"

 return="boolean"

 abstract="false"
@@ -196565,6 +196620,17 @@ 
 visibility="public"

>

</method>

<method name="isScrollLockLatched"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isShiftPressed"

 return="boolean"

 abstract="false"
@@ -196986,6 +197052,17 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_BREAK"

 type="int"

 transient="false"

 volatile="false"

 value="121"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_BUTTON_A"

 type="int"

 transient="false"
@@ -197184,6 +197261,17 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_CAPS_LOCK"

 type="int"

 transient="false"

 volatile="false"

 value="115"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_CLEAR"

 type="int"

 transient="false"
@@ -197206,6 +197294,28 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_CTRL_LEFT"

 type="int"

 transient="false"

 volatile="false"

 value="113"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_CTRL_RIGHT"

 type="int"

 transient="false"

 volatile="false"

 value="114"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_D"

 type="int"

 transient="false"
@@ -197338,495 +197448,1023 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_EXPLORER"

<field name="KEYCODE_ESCAPE"

 type="int"

 transient="false"

 volatile="false"

 value="64"

 value="111"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_F"

<field name="KEYCODE_EXPLORER"

 type="int"

 transient="false"

 volatile="false"

 value="34"

 value="64"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_FOCUS"

<field name="KEYCODE_F"

 type="int"

 transient="false"

 volatile="false"

 value="80"

 value="34"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_G"

<field name="KEYCODE_F1"

 type="int"

 transient="false"

 volatile="false"

 value="35"

 value="131"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_GRAVE"

<field name="KEYCODE_F10"

 type="int"

 transient="false"

 volatile="false"

 value="68"

 value="140"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_H"

<field name="KEYCODE_F11"

 type="int"

 transient="false"

 volatile="false"

 value="36"

 value="141"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_HEADSETHOOK"

<field name="KEYCODE_F12"

 type="int"

 transient="false"

 volatile="false"

 value="79"

 value="142"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_HOME"

<field name="KEYCODE_F2"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 value="132"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_I"

<field name="KEYCODE_F3"

 type="int"

 transient="false"

 volatile="false"

 value="37"

 value="133"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_J"

<field name="KEYCODE_F4"

 type="int"

 transient="false"

 volatile="false"

 value="38"

 value="134"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_K"

<field name="KEYCODE_F5"

 type="int"

 transient="false"

 volatile="false"

 value="39"

 value="135"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_L"

<field name="KEYCODE_F6"

 type="int"

 transient="false"

 volatile="false"

 value="40"

 value="136"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_LEFT_BRACKET"

<field name="KEYCODE_F7"

 type="int"

 transient="false"

 volatile="false"

 value="71"

 value="137"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_M"

<field name="KEYCODE_F8"

 type="int"

 transient="false"

 volatile="false"

 value="41"

 value="138"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MEDIA_FAST_FORWARD"

<field name="KEYCODE_F9"

 type="int"

 transient="false"

 volatile="false"

 value="90"

 value="139"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MEDIA_NEXT"

<field name="KEYCODE_FOCUS"

 type="int"

 transient="false"

 volatile="false"

 value="87"

 value="80"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MEDIA_PLAY_PAUSE"

<field name="KEYCODE_FORWARD"

 type="int"

 transient="false"

 volatile="false"

 value="85"

 value="125"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MEDIA_PREVIOUS"

<field name="KEYCODE_FORWARD_DEL"

 type="int"

 transient="false"

 volatile="false"

 value="88"

 value="112"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MEDIA_REWIND"

<field name="KEYCODE_FUNCTION"

 type="int"

 transient="false"

 volatile="false"

 value="89"

 value="119"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MEDIA_STOP"

<field name="KEYCODE_G"

 type="int"

 transient="false"

 volatile="false"

 value="86"

 value="35"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MENU"

<field name="KEYCODE_GRAVE"

 type="int"

 transient="false"

 volatile="false"

 value="82"

 value="68"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MINUS"

<field name="KEYCODE_H"

 type="int"

 transient="false"

 volatile="false"

 value="69"

 value="36"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MUTE"

<field name="KEYCODE_HEADSETHOOK"

 type="int"

 transient="false"

 volatile="false"

 value="91"

 value="79"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_N"

<field name="KEYCODE_HOME"

 type="int"

 transient="false"

 volatile="false"

 value="42"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NOTIFICATION"

<field name="KEYCODE_I"

 type="int"

 transient="false"

 volatile="false"

 value="83"

 value="37"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUM"

<field name="KEYCODE_INSERT"

 type="int"

 transient="false"

 volatile="false"

 value="78"

 value="124"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_O"

<field name="KEYCODE_J"

 type="int"

 transient="false"

 volatile="false"

 value="43"

 value="38"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_P"

<field name="KEYCODE_K"

 type="int"

 transient="false"

 volatile="false"

 value="44"

 value="39"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PAGE_DOWN"

<field name="KEYCODE_L"

 type="int"

 transient="false"

 volatile="false"

 value="93"

 value="40"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PAGE_UP"

<field name="KEYCODE_LEFT_BRACKET"

 type="int"

 transient="false"

 volatile="false"

 value="92"

 value="71"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PERIOD"

<field name="KEYCODE_M"

 type="int"

 transient="false"

 volatile="false"

 value="56"

 value="41"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PICTSYMBOLS"

<field name="KEYCODE_MEDIA_CLOSE"

 type="int"

 transient="false"

 volatile="false"

 value="94"

 value="128"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PLUS"

<field name="KEYCODE_MEDIA_EJECT"

 type="int"

 transient="false"

 volatile="false"

 value="81"

 value="129"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_POUND"

<field name="KEYCODE_MEDIA_FAST_FORWARD"

 type="int"

 transient="false"

 volatile="false"

 value="18"

 value="90"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_POWER"

<field name="KEYCODE_MEDIA_NEXT"

 type="int"

 transient="false"

 volatile="false"

 value="26"

 value="87"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_Q"

<field name="KEYCODE_MEDIA_PAUSE"

 type="int"

 transient="false"

 volatile="false"

 value="45"

 value="127"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_R"

<field name="KEYCODE_MEDIA_PLAY"

 type="int"

 transient="false"

 volatile="false"

 value="46"

 value="126"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_RIGHT_BRACKET"

<field name="KEYCODE_MEDIA_PLAY_PAUSE"

 type="int"

 transient="false"

 volatile="false"

 value="72"

 value="85"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_S"

<field name="KEYCODE_MEDIA_PREVIOUS"

 type="int"

 transient="false"

 volatile="false"

 value="47"

 value="88"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SEARCH"

<field name="KEYCODE_MEDIA_RECORD"

 type="int"

 transient="false"

 volatile="false"

 value="84"

 value="130"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SEMICOLON"

<field name="KEYCODE_MEDIA_REWIND"

 type="int"

 transient="false"

 volatile="false"

 value="74"

 value="89"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SHIFT_LEFT"

<field name="KEYCODE_MEDIA_STOP"

 type="int"

 transient="false"

 volatile="false"

 value="59"

 value="86"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SHIFT_RIGHT"

<field name="KEYCODE_MENU"

 type="int"

 transient="false"

 volatile="false"

 value="60"

 value="82"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SLASH"

<field name="KEYCODE_META_LEFT"

 type="int"

 transient="false"

 volatile="false"

 value="76"

 value="117"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SOFT_LEFT"

<field name="KEYCODE_META_RIGHT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 value="118"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MINUS"

 type="int"

 transient="false"

 volatile="false"

 value="69"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MOVE_END"

 type="int"

 transient="false"

 volatile="false"

 value="123"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MOVE_HOME"

 type="int"

 transient="false"

 volatile="false"

 value="122"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_MUTE"

 type="int"

 transient="false"

 volatile="false"

 value="91"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_N"

 type="int"

 transient="false"

 volatile="false"

 value="42"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NOTIFICATION"

 type="int"

 transient="false"

 volatile="false"

 value="83"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUM"

 type="int"

 transient="false"

 volatile="false"

 value="78"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_0"

 type="int"

 transient="false"

 volatile="false"

 value="144"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_1"

 type="int"

 transient="false"

 volatile="false"

 value="145"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_2"

 type="int"

 transient="false"

 volatile="false"

 value="146"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_3"

 type="int"

 transient="false"

 volatile="false"

 value="147"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_4"

 type="int"

 transient="false"

 volatile="false"

 value="148"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_5"

 type="int"

 transient="false"

 volatile="false"

 value="149"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_6"

 type="int"

 transient="false"

 volatile="false"

 value="150"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_7"

 type="int"

 transient="false"

 volatile="false"

 value="151"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_8"

 type="int"

 transient="false"

 volatile="false"

 value="152"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_9"

 type="int"

 transient="false"

 volatile="false"

 value="153"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_ADD"

 type="int"

 transient="false"

 volatile="false"

 value="157"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_COMMA"

 type="int"

 transient="false"

 volatile="false"

 value="159"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_DIVIDE"

 type="int"

 transient="false"

 volatile="false"

 value="154"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_DOT"

 type="int"

 transient="false"

 volatile="false"

 value="158"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_ENTER"

 type="int"

 transient="false"

 volatile="false"

 value="160"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_EQUALS"

 type="int"

 transient="false"

 volatile="false"

 value="161"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_LEFT_PAREN"

 type="int"

 transient="false"

 volatile="false"

 value="162"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_MULTIPLY"

 type="int"

 transient="false"

 volatile="false"

 value="155"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_RIGHT_PAREN"

 type="int"

 transient="false"

 volatile="false"

 value="163"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUMPAD_SUBTRACT"

 type="int"

 transient="false"

 volatile="false"

 value="156"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_NUM_LOCK"

 type="int"

 transient="false"

 volatile="false"

 value="143"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_O"

 type="int"

 transient="false"

 volatile="false"

 value="43"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_P"

 type="int"

 transient="false"

 volatile="false"

 value="44"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PAGE_DOWN"

 type="int"

 transient="false"

 volatile="false"

 value="93"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PAGE_UP"

 type="int"

 transient="false"

 volatile="false"

 value="92"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PERIOD"

 type="int"

 transient="false"

 volatile="false"

 value="56"

 static="true"

 final="true"

 deprecated="not deprecated"

 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"

 volatile="false"

 value="81"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_POUND"

 type="int"

 transient="false"

 volatile="false"

 value="18"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_POWER"

 type="int"

 transient="false"

 volatile="false"

 value="26"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_Q"

 type="int"

 transient="false"

 volatile="false"

 value="45"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_R"

 type="int"

 transient="false"

 volatile="false"

 value="46"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_RIGHT_BRACKET"

 type="int"

 transient="false"

 volatile="false"

 value="72"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_S"

 type="int"

 transient="false"

 volatile="false"

 value="47"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SCROLL_LOCK"

 type="int"

 transient="false"

 volatile="false"

 value="116"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SEARCH"

 type="int"

 transient="false"

 volatile="false"

 value="84"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SEMICOLON"

 type="int"

 transient="false"

 volatile="false"

 value="74"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SHIFT_LEFT"

 type="int"

 transient="false"

 volatile="false"

 value="59"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SHIFT_RIGHT"

 type="int"

 transient="false"

 volatile="false"

 value="60"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SLASH"

 type="int"

 transient="false"

 volatile="false"

 value="76"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_SOFT_LEFT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -197888,6 +198526,17 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_SYSRQ"

 type="int"

 transient="false"

 volatile="false"

 value="120"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_T"

 type="int"

 transient="false"
@@ -198053,6 +198702,116 @@ 
 visibility="public"

>

</field>

<field name="META_CAPS_LOCK_LATCHED"

 type="int"

 transient="false"

 volatile="false"

 value="1048576"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_CTRL_LEFT_ON"

 type="int"

 transient="false"

 volatile="false"

 value="8192"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_CTRL_ON"

 type="int"

 transient="false"

 volatile="false"

 value="4096"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_CTRL_RIGHT_ON"

 type="int"

 transient="false"

 volatile="false"

 value="16384"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_FUNCTION_ON"

 type="int"

 transient="false"

 volatile="false"

 value="8"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_META_LEFT_ON"

 type="int"

 transient="false"

 volatile="false"

 value="131072"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_META_ON"

 type="int"

 transient="false"

 volatile="false"

 value="65536"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_META_RIGHT_ON"

 type="int"

 transient="false"

 volatile="false"

 value="262144"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_NUM_LOCK_LATCHED"

 type="int"

 transient="false"

 volatile="false"

 value="2097152"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_SCROLL_LOCK_LATCHED"

 type="int"

 transient="false"

 volatile="false"

 value="4194304"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="META_SHIFT_LEFT_ON"

 type="int"

 transient="false"

core/java/android/text/Layout.java

+3 −6

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/text/method/ArrowKeyMovementMethod.java

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/text/method/DialerKeyListener.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class DialerKeyListener extends NumberKeyListener 
         * Prefer number if no meta key is active, or if it produces something

         * valid and the meta lookup does not.

         */

        if ((meta & (KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON)) == 0) {

        if ((meta & (MetaKeyKeyListener.META_ALT_ON | MetaKeyKeyListener.META_SHIFT_ON)) == 0) {

            if (number != 0) {

                return number;

            }

core/java/android/text/method/MetaKeyKeyListener.java

+148 −89

File changed.

Preview size limit exceeded, changes collapsed.