[Android DomKey] Add TV, Navigate, Media and others missing mappings

ui/events/keycodes/keyboard_code_conversion_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 
 #include <android/keycodes.h>
 
 namespace ui {
 namespace {
@@ skipping 37 matching lines @@
   AKEYCODE_TV_INPUT_COMPONENT_2 = 250,
   AKEYCODE_TV_INPUT_VGA_1 = 251,
   AKEYCODE_TV_AUDIO_DESCRIPTION = 252,
   AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP = 253,
   AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN = 254,
   AKEYCODE_TV_ZOOM_MODE = 255,
   AKEYCODE_TV_CONTENTS_MENU = 256,
   AKEYCODE_TV_MEDIA_CONTEXT_MENU = 257,
   AKEYCODE_TV_TIMER_PROGRAMMING = 258,
   AKEYCODE_HELP = 259,
+  AKEYCODE_NAVIGATE_PREVIOUS = 260,
+  AKEYCODE_NAVIGATE_NEXT = 261,
+  AKEYCODE_NAVIGATE_IN = 262,
+  AKEYCODE_NAVIGATE_OUT = 263,
+  AKEYCODE_MEDIA_SKIP_FORWARD = 272,
+  AKEYCODE_MEDIA_SKIP_BACKWARD = 273,
+  AKEYCODE_MEDIA_STEP_FORWARD = 274,
+  AKEYCODE_MEDIA_STEP_BACKWARD = 275,
   AKEYCODE_CUT = 277,
   AKEYCODE_COPY = 278,
   AKEYCODE_PASTE = 279,
 };
 
 DomKey GetDomKeyFromAndroidKeycode(int keycode) {
   switch (keycode) {
     default:
     case AKEYCODE_UNKNOWN:
       return DomKey::NONE;
     case AKEYCODE_HOME:
-      return DomKey::HOME;
+      return DomKey::GO_HOME;
     case AKEYCODE_BACK:
-      return DomKey::BROWSER_BACK;
+      return DomKey::GO_BACK;
+    case AKEYCODE_CALL:
+      return DomKey::CALL;
+    case AKEYCODE_ENDCALL:
+      return DomKey::END_CALL;
     case AKEYCODE_DPAD_UP:
       return DomKey::ARROW_UP;
     case AKEYCODE_DPAD_DOWN:
       return DomKey::ARROW_DOWN;
     case AKEYCODE_DPAD_LEFT:
       return DomKey::ARROW_LEFT;
     case AKEYCODE_DPAD_RIGHT:
       return DomKey::ARROW_RIGHT;
+    case AKEYCODE_DPAD_CENTER:
+      return DomKey::ENTER;
     case AKEYCODE_VOLUME_UP:
       return DomKey::AUDIO_VOLUME_UP;
     case AKEYCODE_VOLUME_DOWN:
       return DomKey::AUDIO_VOLUME_DOWN;
     case AKEYCODE_POWER:
       return DomKey::POWER;
     case AKEYCODE_CAMERA:
       return DomKey::CAMERA;
     case AKEYCODE_CLEAR:
       return DomKey::CLEAR;
     case AKEYCODE_ALT_LEFT:
     case AKEYCODE_ALT_RIGHT:
       return DomKey::ALT;
     case AKEYCODE_SHIFT_LEFT:
     case AKEYCODE_SHIFT_RIGHT:
       return DomKey::SHIFT;
     case AKEYCODE_TAB:
       return DomKey::TAB;
     case AKEYCODE_SYM:
       return DomKey::SYMBOL;
     case AKEYCODE_EXPLORER:
       return DomKey::LAUNCH_WEB_BROWSER;
     case AKEYCODE_ENVELOPE:
       return DomKey::LAUNCH_MAIL;
     case AKEYCODE_ENTER:
       return DomKey::ENTER;
     case AKEYCODE_DEL:
       return DomKey::BACKSPACE;
+    case AKEYCODE_HEADSETHOOK:
+      return DomKey::HEADSET_HOOK;
+    case AKEYCODE_FOCUS:
+      return DomKey::CAMERA_FOCUS;
+    case AKEYCODE_NOTIFICATION:
+      return DomKey::NOTIFICATION;
     case AKEYCODE_MENU:
       return DomKey::CONTEXT_MENU;
     case AKEYCODE_SEARCH:
       return DomKey::BROWSER_SEARCH;
     case AKEYCODE_MEDIA_PLAY_PAUSE:
       return DomKey::MEDIA_PLAY_PAUSE;
     case AKEYCODE_MEDIA_STOP:
       return DomKey::MEDIA_STOP;
     case AKEYCODE_MEDIA_NEXT:
       return DomKey::MEDIA_TRACK_NEXT;
     case AKEYCODE_MEDIA_PREVIOUS:
       return DomKey::MEDIA_TRACK_PREVIOUS;
     case AKEYCODE_MEDIA_REWIND:
       return DomKey::MEDIA_REWIND;
     case AKEYCODE_MEDIA_FAST_FORWARD:
       return DomKey::MEDIA_FAST_FORWARD;
     case AKEYCODE_MUTE:
-      return DomKey::AUDIO_VOLUME_MUTE;
+      return DomKey::MICROPHONE_VOLUME_MUTE;
     case AKEYCODE_PAGE_UP:
       return DomKey::PAGE_UP;
     case AKEYCODE_PAGE_DOWN:
       return DomKey::PAGE_DOWN;
     case AKEYCODE_SWITCH_CHARSET:
       return DomKey::MODE_CHANGE;
     case AKEYCODE_ESCAPE:
       return DomKey::ESCAPE;
     case AKEYCODE_FORWARD_DEL:
       return DomKey::DEL;
@@ skipping 94 matching lines @@
     case AKEYCODE_AVR_INPUT:
       return DomKey::AVR_INPUT;
     case AKEYCODE_PROG_RED:
       return DomKey::COLOR_F0_RED;
     case AKEYCODE_PROG_GREEN:
       return DomKey::COLOR_F1_GREEN;
     case AKEYCODE_PROG_YELLOW:
       return DomKey::COLOR_F2_YELLOW;
     case AKEYCODE_PROG_BLUE:
       return DomKey::COLOR_F3_BLUE;
+    case AKEYCODE_APP_SWITCH:
+      return DomKey::APP_SWITCH;
     case AKEYCODE_LANGUAGE_SWITCH:
       return DomKey::GROUP_NEXT;
+    case AKEYCODE_MANNER_MODE:
+      return DomKey::MANNER_MODE;
+    case AKEYCODE_3D_MODE:
+      return DomKey::TV_3D_MODE;
+    case AKEYCODE_CONTACTS:
+      return DomKey::LAUNCH_CONTACTS;
     case AKEYCODE_CALENDAR:
       return DomKey::LAUNCH_CALENDAR;
     case AKEYCODE_MUSIC:
       return DomKey::LAUNCH_MUSIC_PLAYER;
     case AKEYCODE_CALCULATOR:
       return DomKey::LAUNCH_CALCULATOR;
     case AKEYCODE_ZENKAKU_HANKAKU:
       return DomKey::ZENKAKU_HANKAKU;
     case AKEYCODE_EISU:
       return DomKey::EISU;
     case AKEYCODE_MUHENKAN:
       return DomKey::NON_CONVERT;
     case AKEYCODE_HENKAN:
       return DomKey::CONVERT;
     case AKEYCODE_KATAKANA_HIRAGANA:
       return DomKey::HIRAGANA_KATAKANA;
+    case AKEYCODE_KANA:
+      return DomKey::KANA_MODE;
     case AKEYCODE_BRIGHTNESS_DOWN:
       return DomKey::BRIGHTNESS_DOWN;
     case AKEYCODE_BRIGHTNESS_UP:
       return DomKey::BRIGHTNESS_UP;
+    case AKEYCODE_MEDIA_AUDIO_TRACK:
+      return DomKey::MEDIA_AUDIO_TRACK;
     case AKEYCODE_SLEEP:
       return DomKey::STANDBY;
     case AKEYCODE_WAKEUP:
       return DomKey::WAKE_UP;
+    case AKEYCODE_PAIRING:
+      return DomKey::PAIRING;
+    case AKEYCODE_MEDIA_TOP_MENU:
+      return DomKey::MEDIA_TOP_MENU;
     case AKEYCODE_LAST_CHANNEL:
       return DomKey::MEDIA_LAST;
+    case AKEYCODE_TV_DATA_SERVICE:
+      return DomKey::TV_DATA_SERVICE;
+    case AKEYCODE_TV_RADIO_SERVICE:
+      return DomKey::TV_RADIO_SERVICE;
+    case AKEYCODE_TV_TELETEXT:
+      return DomKey::TELETEXT;
+    case AKEYCODE_TV_NUMBER_ENTRY:
+      return DomKey::TV_NUMBER_ENTRY;
+    case AKEYCODE_TV_TERRESTRIAL_ANALOG:
+      return DomKey::TV_TERRESTRIAL_ANALOG;
+    case AKEYCODE_TV_TERRESTRIAL_DIGITAL:
+      return DomKey::TV_TERRESTRIAL_DIGITAL;
+    case AKEYCODE_TV_SATELLITE:
+      return DomKey::TV_SATELLITE;
+    case AKEYCODE_TV_SATELLITE_BS:
+      return DomKey::TV_SATELLITE_BS;
+    case AKEYCODE_TV_SATELLITE_CS:
+      return DomKey::TV_SATELLITE_CS;
+    case AKEYCODE_TV_SATELLITE_SERVICE:
+      return DomKey::TV_SATELLITE_TOGGLE;
+    case AKEYCODE_TV_NETWORK:
+      return DomKey::TV_NETWORK;
+    case AKEYCODE_TV_ANTENNA_CABLE:
+      return DomKey::TV_ANTENNA_CABLE;
+    case AKEYCODE_TV_INPUT_HDMI_1:
+      return DomKey::TV_INPUT_HDMI1;
+    case AKEYCODE_TV_INPUT_HDMI_2:
+      return DomKey::TV_INPUT_HDMI2;
+    case AKEYCODE_TV_INPUT_HDMI_3:
+      return DomKey::TV_INPUT_HDMI3;
+    case AKEYCODE_TV_INPUT_HDMI_4:
+      return DomKey::TV_INPUT_HDMI4;
+    case AKEYCODE_TV_INPUT_COMPOSITE_1:
+      return DomKey::TV_INPUT_COMPONENT1;
+    case AKEYCODE_TV_INPUT_COMPOSITE_2:
+      return DomKey::TV_INPUT_COMPONENT2;
+    case AKEYCODE_TV_INPUT_COMPONENT_1:
+      return DomKey::TV_INPUT_COMPOSITE1;
+    case AKEYCODE_TV_INPUT_COMPONENT_2:
+      return DomKey::TV_INPUT_COMPOSITE2;
+    case AKEYCODE_TV_INPUT_VGA_1:
+      return DomKey::TV_INPUT_VGA1;
+    case AKEYCODE_TV_AUDIO_DESCRIPTION:
+      return DomKey::TV_AUDIO_DESCRIPTION;
+    case AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP:
+      return DomKey::TV_AUDIO_DESCRIPTION_MIX_UP;
+    case AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN:
+      return DomKey::TV_AUDIO_DESCRIPTION_MIX_DOWN;
     case AKEYCODE_TV_ZOOM_MODE:
       return DomKey::ZOOM_TOGGLE;
+    case AKEYCODE_TV_CONTENTS_MENU:
+      return DomKey::TV_CONTENTS_MENU;
+    case AKEYCODE_TV_TIMER_PROGRAMMING:
+      return DomKey::TV_TIMER;
     case AKEYCODE_HELP:
       return DomKey::HELP;
+    case AKEYCODE_NAVIGATE_PREVIOUS:
+      return DomKey::NAVIGATE_PREVIOUS;
+    case AKEYCODE_NAVIGATE_NEXT:
+      return DomKey::NAVIGATE_NEXT;
+    case AKEYCODE_NAVIGATE_IN:
+      return DomKey::NAVIGATE_IN;
+    case AKEYCODE_NAVIGATE_OUT:
+      return DomKey::NAVIGATE_OUT;
+    case AKEYCODE_MEDIA_SKIP_FORWARD:
+      return DomKey::MEDIA_SKIP_FORWARD;
+    case AKEYCODE_MEDIA_SKIP_BACKWARD:
+      return DomKey::MEDIA_SKIP_BACKWARD;
+    case AKEYCODE_MEDIA_STEP_FORWARD:
+      return DomKey::MEDIA_STEP_FORWARD;
+    case AKEYCODE_MEDIA_STEP_BACKWARD:
+      return DomKey::MEDIA_STEP_BACKWARD;
     case AKEYCODE_CUT:
       return DomKey::CUT;
     case AKEYCODE_COPY:
       return DomKey::COPY;
     case AKEYCODE_PASTE:
       return DomKey::PASTE;
 
     // The following codes should already be handled as printable
     // character mapping.
 
@@ skipping 69 matching lines @@
     // case AKEYCODE_NUMPAD_RIGHT_PAREN:
     // case AKEYCODE_SPACE:
     // case AKEYCODE_PLUS:
 
     // The following codes are unsupported. ie; there is no
     // applicable mapping from the Android keycode to DOM Code
     // currently.
 
     // case AKEYCODE_SOFT_LEFT:
     // case AKEYCODE_SOFT_RIGHT:
-    // case AKEYCODE_CALL:
-    // case AKEYCODE_ENDCALL:
-    // case AKEYCODE_DPAD_CENTER:
-    // case AKEYCODE_HEADSETHOOK:
-    // case AKEYCODE_FOCUS:
-    // case AKEYCODE_NOTIFICATION:
     // case AKEYCODE_PICTSYMBOLS:
     // case AKEYCODE_BUTTON_A:
     // case AKEYCODE_BUTTON_B:
     // case AKEYCODE_BUTTON_C:
     // case AKEYCODE_BUTTON_X:
     // case AKEYCODE_BUTTON_Y:
     // case AKEYCODE_BUTTON_Z:
     // case AKEYCODE_BUTTON_L1:
     // case AKEYCODE_BUTTON_R1:
     // case AKEYCODE_BUTTON_L2:
     // case AKEYCODE_BUTTON_R2:
     // case AKEYCODE_BUTTON_THUMBL:
     // case AKEYCODE_BUTTON_THUMBR:
     // case AKEYCODE_BUTTON_START:
     // case AKEYCODE_BUTTON_SELECT:
     // case AKEYCODE_BUTTON_MODE:
     // case AKEYCODE_WINDOW:
     // case AKEYCODE_DVR:
-    // case AKEYCODE_APP_SWITCH:
     // case AKEYCODE_BUTTON_1:
     // case AKEYCODE_BUTTON_2:
     // case AKEYCODE_BUTTON_3:
     // case AKEYCODE_BUTTON_4:
     // case AKEYCODE_BUTTON_5:
     // case AKEYCODE_BUTTON_6:
     // case AKEYCODE_BUTTON_7:
     // case AKEYCODE_BUTTON_8:
     // case AKEYCODE_BUTTON_9:
     // case AKEYCODE_BUTTON_10:
     // case AKEYCODE_BUTTON_11:
     // case AKEYCODE_BUTTON_12:
     // case AKEYCODE_BUTTON_13:
     // case AKEYCODE_BUTTON_14:
     // case AKEYCODE_BUTTON_15:
     // case AKEYCODE_BUTTON_16:
-    // case AKEYCODE_MANNER_MODE:
-    // case AKEYCODE_3D_MODE:
-    // case AKEYCODE_CONTACTS:
     // case AKEYCODE_YEN:
     // case AKEYCODE_RO:
-    // case AKEYCODE_KANA:
     // case AKEYCODE_ASSIST:
-    // case AKEYCODE_MEDIA_AUDIO:
-    // case AKEYCODE_PAIRING:
-    // case AKEYCODE_MEDIA_TOP:
     // case AKEYCODE_11:
     // case AKEYCODE_12:
     // case AKEYCODE_TV_DATA:
     // case AKEYCODE_VOICE_ASSIST:
-    // case AKEYCODE_TV_RADIO:
-    // case AKEYCODE_TV_TELETEXT:
-    // case AKEYCODE_TV_NUMBER:
-    // case AKEYCODE_TV_TERRESTRIAL_ANALOG:
-    // case AKEYCODE_TV_TERRESTRIAL_DIGITAL:
-    // case AKEYCODE_TV_SATELLITE:
-    // case AKEYCODE_TV_SATELLITE_BS:
-    // case AKEYCODE_TV_SATELLITE_CS:
-    // case AKEYCODE_TV_SATELLITE_SERVICE:
-    // case AKEYCODE_TV_NETWORK:
-    // case AKEYCODE_TV_ANTENNA_CABLE:
-    // case AKEYCODE_TV_INPUT_HDMI_1:
-    // case AKEYCODE_TV_INPUT_HDMI_2:
-    // case AKEYCODE_TV_INPUT_HDMI_3:
-    // case AKEYCODE_TV_INPUT_HDMI_4:
-    // case AKEYCODE_TV_INPUT_COMPOSITE_1:
-    // case AKEYCODE_TV_INPUT_COMPOSITE_2:
-    // case AKEYCODE_TV_INPUT_COMPONENT_1:
-    // case AKEYCODE_TV_INPUT_COMPONENT_2:
-    // case AKEYCODE_TV_INPUT_VGA_1:
-    // case AKEYCODE_TV_AUDIO_DESCRIPTION:
-    // case AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP:
-    // case AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN:
-    // case AKEYCODE_TV_CONTENTS_MENU:
     // case AKEYCODE_TV_MEDIA_CONTEXT_MENU:
-    // case AKEYCODE_TV_TIMER_PROGRAMMING:
   }
 }
 
 }  // namespace
 
 DomKey GetDomKeyFromAndroidEvent(int keycode, int unicode_character) {
   // Android maps ENTER to '\n'; but the DOM maps it to '\r'; ensure
   // the difference in mapping is mitigated.
   if (unicode_character == '\n')
     unicode_character = '\r';
@@ skipping 252 matching lines @@
     case AKEYCODE_CHANNEL_UP:
       return VKEY_PRIOR;
     case AKEYCODE_CHANNEL_DOWN:
       return VKEY_NEXT;
     default:
       return VKEY_UNKNOWN;
   }
 }
 
 }  // namespace ui