Commit: 0184443e1914676436148cea584823e2f260c14e - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revisão: 0184443e1914676436148cea584823e2f260c14e (tree)
• Hora: 2011-08-05 17:26:23
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Mensagem de Log

Add keycodes F1 - F12

With these keycodes we are able to support PC keyboards.

Change-Id: Ia6f6ac93c7bfbe89a0017875d52844676c2b1b33
Signed-off-by: Chih-Wei Huang <[e-mail]>

Mudança Sumário

• modified: api/current.xml
• modified: core/java/android/view/KeyEvent.java
• modified: core/res/res/values/attrs.xml
• modified: include/ui/KeycodeLabels.h
• modified: native/include/android/keycodes.h

Diff

--- a/api/current.xml
+++ b/api/current.xml
@@ -180799,6 +180799,138 @@
  visibility="public"
 >
 </field>
+<field name="KEYCODE_F1"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="111"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F10"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="120"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F11"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="121"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F12"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="122"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F2"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="112"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F3"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="113"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F4"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="114"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F5"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="115"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F6"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="116"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F7"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="117"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F8"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="118"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="KEYCODE_F9"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="119"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="KEYCODE_FOCUS"
  type="int"
  transient="false"

--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -331,6 +331,30 @@ public class KeyEvent extends InputEvent implements Parcelable {
     /** Key code constant: Mode Button key.
      * On a game controller, the button labeled Mode. */
     public static final int KEYCODE_BUTTON_MODE     = 110;
+    /** Key code constant: F1 key. */
+    public static final int KEYCODE_F1              = 111;
+    /** Key code constant: F2 key. */
+    public static final int KEYCODE_F2              = 112;
+    /** Key code constant: F3 key. */
+    public static final int KEYCODE_F3              = 113;
+    /** Key code constant: F4 key. */
+    public static final int KEYCODE_F4              = 114;
+    /** Key code constant: F5 key. */
+    public static final int KEYCODE_F5              = 115;
+    /** Key code constant: F6 key. */
+    public static final int KEYCODE_F6              = 116;
+    /** Key code constant: F7 key. */
+    public static final int KEYCODE_F7              = 117;
+    /** Key code constant: F8 key. */
+    public static final int KEYCODE_F8              = 118;
+    /** Key code constant: F9 key. */
+    public static final int KEYCODE_F9              = 119;
+    /** Key code constant: F10 key. */
+    public static final int KEYCODE_F10             = 120;
+    /** Key code constant: F11 key. */
+    public static final int KEYCODE_F11             = 121;
+    /** Key code constant: F12 key. */
+    public static final int KEYCODE_F12             = 122;
 
     // NOTE: If you add a new keycode here you must also add it to:
     //  isSystem()
@@ -348,7 +372,7 @@ public class KeyEvent extends InputEvent 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_BUTTON_MODE;
+    private static final int LAST_KEYCODE           = KEYCODE_F12;
     
     /**
      * @deprecated There are now more than MAX_KEYCODE keycodes.

--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -953,6 +953,18 @@
         <enum name="KEYCODE_BUTTON_START" value="108" />
         <enum name="KEYCODE_BUTTON_SELECT" value="109" />
         <enum name="KEYCODE_BUTTON_MODE" value="110" />
+        <enum name="KEYCODE_F1" value="111" />
+        <enum name="KEYCODE_F2" value="112" />
+        <enum name="KEYCODE_F3" value="113" />
+        <enum name="KEYCODE_F4" value="114" />
+        <enum name="KEYCODE_F5" value="115" />
+        <enum name="KEYCODE_F6" value="116" />
+        <enum name="KEYCODE_F7" value="117" />
+        <enum name="KEYCODE_F8" value="118" />
+        <enum name="KEYCODE_F9" value="119" />
+        <enum name="KEYCODE_F10" value="120" />
+        <enum name="KEYCODE_F11" value="121" />
+        <enum name="KEYCODE_F12" value="122" />
     </attr>
 
     <!-- ***************************************************************** -->

--- a/include/ui/KeycodeLabels.h
+++ b/include/ui/KeycodeLabels.h
@@ -135,6 +135,18 @@ static const KeycodeLabel KEYCODES[] = {
     { "BUTTON_START", 108 },
     { "BUTTON_SELECT", 109 },
     { "BUTTON_MODE", 110 },
+    { "F1", 111 },
+    { "F2", 112 },
+    { "F3", 113 },
+    { "F4", 114 },
+    { "F5", 115 },
+    { "F6", 116 },
+    { "F7", 117 },
+    { "F8", 118 },
+    { "F9", 119 },
+    { "F10", 120 },
+    { "F11", 121 },
+    { "F12", 122 },
 
     // NOTE: If you add a new keycode here you must also add it to several other files.
     //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

--- a/native/include/android/keycodes.h
+++ b/native/include/android/keycodes.h
@@ -154,6 +154,18 @@ enum {
     AKEYCODE_BUTTON_START    = 108,
     AKEYCODE_BUTTON_SELECT   = 109,
     AKEYCODE_BUTTON_MODE     = 110,
+    AKEYCODE_F1              = 111,
+    AKEYCODE_F2              = 112,
+    AKEYCODE_F3              = 113,
+    AKEYCODE_F4              = 114,
+    AKEYCODE_F5              = 115,
+    AKEYCODE_F6              = 116,
+    AKEYCODE_F7              = 117,
+    AKEYCODE_F8              = 118,
+    AKEYCODE_F9              = 119,
+    AKEYCODE_F10             = 120,
+    AKEYCODE_F11             = 121,
+    AKEYCODE_F12             = 122,
 
     // NOTE: If you add a new keycode here you must also add it to several other files.
     //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.