diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 10 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 3 |
4 files changed, 17 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 4a1a4582e1b4..cacf3be639b8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35330,8 +35330,10 @@ package android.view { field public static final int KEYCODE_CLEAR = 28; // 0x1c field public static final int KEYCODE_COMMA = 55; // 0x37 field public static final int KEYCODE_CONTACTS = 207; // 0xcf + field public static final int KEYCODE_COPY = 278; // 0x116 field public static final int KEYCODE_CTRL_LEFT = 113; // 0x71 field public static final int KEYCODE_CTRL_RIGHT = 114; // 0x72 + field public static final int KEYCODE_CUT = 277; // 0x115 field public static final int KEYCODE_D = 32; // 0x20 field public static final int KEYCODE_DEL = 67; // 0x43 field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17 @@ -35449,6 +35451,7 @@ package android.view { field public static final int KEYCODE_PAGE_DOWN = 93; // 0x5d field public static final int KEYCODE_PAGE_UP = 92; // 0x5c field public static final int KEYCODE_PAIRING = 225; // 0xe1 + field public static final int KEYCODE_PASTE = 279; // 0x117 field public static final int KEYCODE_PERIOD = 56; // 0x38 field public static final int KEYCODE_PICTSYMBOLS = 94; // 0x5e field public static final int KEYCODE_PLUS = 81; // 0x51 diff --git a/api/system-current.txt b/api/system-current.txt index 8ccc706bbcde..8288be4da742 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37627,8 +37627,10 @@ package android.view { field public static final int KEYCODE_CLEAR = 28; // 0x1c field public static final int KEYCODE_COMMA = 55; // 0x37 field public static final int KEYCODE_CONTACTS = 207; // 0xcf + field public static final int KEYCODE_COPY = 278; // 0x116 field public static final int KEYCODE_CTRL_LEFT = 113; // 0x71 field public static final int KEYCODE_CTRL_RIGHT = 114; // 0x72 + field public static final int KEYCODE_CUT = 277; // 0x115 field public static final int KEYCODE_D = 32; // 0x20 field public static final int KEYCODE_DEL = 67; // 0x43 field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17 @@ -37746,6 +37748,7 @@ package android.view { field public static final int KEYCODE_PAGE_DOWN = 93; // 0x5d field public static final int KEYCODE_PAGE_UP = 92; // 0x5c field public static final int KEYCODE_PAIRING = 225; // 0xe1 + field public static final int KEYCODE_PASTE = 279; // 0x117 field public static final int KEYCODE_PERIOD = 56; // 0x38 field public static final int KEYCODE_PICTSYMBOLS = 94; // 0x5e field public static final int KEYCODE_PLUS = 81; // 0x51 diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 1c20cab55a5d..55cf56ff7c9f 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -790,8 +790,14 @@ public class KeyEvent extends InputEvent implements Parcelable { public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; /** Key code constant: put device to sleep unless a wakelock is held. */ public static final int KEYCODE_SOFT_SLEEP = 276; - - private static final int LAST_KEYCODE = KEYCODE_SOFT_SLEEP; + /** Key code constant: Cut key. */ + public static final int KEYCODE_CUT = 277; + /** Key code constant: Copy key. */ + public static final int KEYCODE_COPY = 278; + /** Key code constant: Paste key. */ + public static final int KEYCODE_PASTE = 279; + + private static final int LAST_KEYCODE = KEYCODE_PASTE; // NOTE: If you add a new keycode here you must also add it to: // isSystem() diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 90306fd5367e..8e36eb052ee4 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1832,6 +1832,9 @@ i <enum name="KEYCODE_MEDIA_STEP_FORWARD" value="274" /> <enum name="KEYCODE_MEDIA_STEP_BACKWARD" value="275" /> <enum name="KEYCODE_SOFT_SLEEP" value="276" /> + <enum name="KEYCODE_CUT" value="277" /> + <enum name="KEYCODE_COPY" value="278" /> + <enum name="KEYCODE_PASTE" value="279" /> </attr> <!-- ***************************************************************** --> |