summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorhush@chromium.org <hush@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-05 08:26:39 +0000
committerhush@chromium.org <hush@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-05 08:26:39 +0000
commit1624bab96169712dbb2d99e25c8db6b2833fcced (patch)
tree7907923f5ef3371aa30097fd04eaf279f18e9bfe /ui
parent8a101ee105e0d429d7d553a47fafbf5b20445cc7 (diff)
downloadchromium_src-1624bab96169712dbb2d99e25c8db6b2833fcced.zip
chromium_src-1624bab96169712dbb2d99e25c8db6b2833fcced.tar.gz
chromium_src-1624bab96169712dbb2d99e25c8db6b2833fcced.tar.bz2
Convert android KEYCODE_MOVE_HOME/END correctly to VKEY_HOME, VKEY_END
BUG=340846 Review URL: https://codereview.chromium.org/154983002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_android.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/events/keycodes/keyboard_code_conversion_android.cc b/ui/events/keycodes/keyboard_code_conversion_android.cc
index fa0ed31..b7bdc83 100644
--- a/ui/events/keycodes/keyboard_code_conversion_android.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_android.cc
@@ -21,6 +21,8 @@ enum {
AKEYCODE_META_LEFT = 117,
AKEYCODE_META_RIGHT = 118,
AKEYCODE_BREAK = 121,
+ AKEYCODE_MOVE_HOME = 122,
+ AKEYCODE_MOVE_END = 123,
AKEYCODE_INSERT = 124,
AKEYCODE_MEDIA_PLAY = 126,
AKEYCODE_MEDIA_PAUSE = 127,
@@ -80,7 +82,7 @@ KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) {
return VKEY_ESCAPE;
case AKEYCODE_SPACE:
return VKEY_SPACE;
- case AKEYCODE_HOME:
+ case AKEYCODE_MOVE_HOME:
return VKEY_HOME;
case AKEYCODE_DPAD_LEFT:
return VKEY_LEFT;
@@ -201,7 +203,7 @@ KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) {
case AKEYCODE_MEDIA_PLAY:
case AKEYCODE_MEDIA_PLAY_PAUSE:
return VKEY_MEDIA_PLAY_PAUSE;
- case AKEYCODE_CALL:
+ case AKEYCODE_MOVE_END:
return VKEY_END;
case AKEYCODE_ALT_LEFT:
return VKEY_LMENU;