Commit ec841bf1 authored by shuchen's avatar shuchen Committed by Commit bot

Support 3 keyboards:

    - Russian phonetic (YaZHert) keyboard
    - Russian phonetic (AATSEEL) keyboard
    - Maltese keyboard

Also support Irish keyboard as login keyboard.

BUG=173149
TEST=Verified on linux_chromeos.

Review URL: https://codereview.chromium.org/643853002

Cr-Commit-Position: refs/heads/master@{#300272}
parent a3af6492
...@@ -4643,6 +4643,9 @@ Battery full ...@@ -4643,6 +4643,9 @@ Battery full
<message name="IDS_IME_NAME_KEYBOARD_LITHUANIAN" desc="The input method name shows in system tray menu, this shows [Lithuanian keyboard]."> <message name="IDS_IME_NAME_KEYBOARD_LITHUANIAN" desc="The input method name shows in system tray menu, this shows [Lithuanian keyboard].">
Lithuanian keyboard Lithuanian keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_MALTESE" desc="The input method name shows in system tray menu, this shows [Maltese keyboard].">
Maltese keyboard
</message>
<message name="IDS_IME_NAME_KEYBOARD_MONGOLIAN" desc="The input method name shows in system tray menu, this shows [Mongolian keyboard]."> <message name="IDS_IME_NAME_KEYBOARD_MONGOLIAN" desc="The input method name shows in system tray menu, this shows [Mongolian keyboard].">
Mongolian keyboard Mongolian keyboard
</message> </message>
...@@ -4664,6 +4667,12 @@ Battery full ...@@ -4664,6 +4667,12 @@ Battery full
<message name="IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC" desc="The input method name shows in system tray menu, this shows [Russian Phonetic keyboard]."> <message name="IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC" desc="The input method name shows in system tray menu, this shows [Russian Phonetic keyboard].">
Russian Phonetic keyboard Russian Phonetic keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC_AATSEEL" desc="The input method name shows in system tray menu, this shows [Russian Phonetic (AATSEEL) keyboard].">
Russian Phonetic (AATSEEL) keyboard
</message>
<message name="IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC_YAZHERT" desc="The input method name shows in system tray menu, this shows [Russian Phonetic (YaZHert) keyboard].">
Russian Phonetic (YaZHert) keyboard
</message>
<message name="IDS_IME_NAME_KEYBOARD_SERBIAN" desc="The input method name shows in system tray menu, this shows [Serbian keyboard]."> <message name="IDS_IME_NAME_KEYBOARD_SERBIAN" desc="The input method name shows in system tray menu, this shows [Serbian keyboard].">
Serbian keyboard Serbian keyboard
</message> </message>
......
...@@ -153,6 +153,7 @@ const struct InputMethodNameMap { ...@@ -153,6 +153,7 @@ const struct InputMethodNameMap {
{"__MSG_KEYBOARD_LITHUANIAN__", IDS_IME_NAME_KEYBOARD_LITHUANIAN}, {"__MSG_KEYBOARD_LITHUANIAN__", IDS_IME_NAME_KEYBOARD_LITHUANIAN},
{"__MSG_KEYBOARD_MALAYALAM_PHONETIC__", {"__MSG_KEYBOARD_MALAYALAM_PHONETIC__",
IDS_IME_NAME_KEYBOARD_MALAYALAM_PHONETIC}, IDS_IME_NAME_KEYBOARD_MALAYALAM_PHONETIC},
{"__MSG_KEYBOARD_MALTESE__", IDS_IME_NAME_KEYBOARD_MALTESE},
{"__MSG_KEYBOARD_MONGOLIAN__", IDS_IME_NAME_KEYBOARD_MONGOLIAN}, {"__MSG_KEYBOARD_MONGOLIAN__", IDS_IME_NAME_KEYBOARD_MONGOLIAN},
{"__MSG_KEYBOARD_MYANMAR_MYANSAN__", {"__MSG_KEYBOARD_MYANMAR_MYANSAN__",
IDS_IME_NAME_KEYBOARD_MYANMAR_MYANSAN}, IDS_IME_NAME_KEYBOARD_MYANMAR_MYANSAN},
...@@ -166,6 +167,10 @@ const struct InputMethodNameMap { ...@@ -166,6 +167,10 @@ const struct InputMethodNameMap {
{"__MSG_KEYBOARD_POLISH__", IDS_IME_NAME_KEYBOARD_POLISH}, {"__MSG_KEYBOARD_POLISH__", IDS_IME_NAME_KEYBOARD_POLISH},
{"__MSG_KEYBOARD_PORTUGUESE__", IDS_IME_NAME_KEYBOARD_PORTUGUESE}, {"__MSG_KEYBOARD_PORTUGUESE__", IDS_IME_NAME_KEYBOARD_PORTUGUESE},
{"__MSG_KEYBOARD_ROMANIAN__", IDS_IME_NAME_KEYBOARD_ROMANIAN}, {"__MSG_KEYBOARD_ROMANIAN__", IDS_IME_NAME_KEYBOARD_ROMANIAN},
{"__MSG_KEYBOARD_RUSSIAN_PHONETIC_AATSEEL__",
IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC_AATSEEL},
{"__MSG_KEYBOARD_RUSSIAN_PHONETIC_YAZHERT__",
IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC_YAZHERT},
{"__MSG_KEYBOARD_RUSSIAN_PHONETIC__", {"__MSG_KEYBOARD_RUSSIAN_PHONETIC__",
IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC}, IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC},
{"__MSG_KEYBOARD_RUSSIAN__", IDS_IME_NAME_KEYBOARD_RUSSIAN}, {"__MSG_KEYBOARD_RUSSIAN__", IDS_IME_NAME_KEYBOARD_RUSSIAN},
......
...@@ -574,6 +574,24 @@ ...@@ -574,6 +574,24 @@
"language": ["my"], "language": ["my"],
"layouts": ["us"], "layouts": ["us"],
"input_view": "inputview.html#id=m17n:my_myansan&language=my&passwordLayout=us&name=keyboard_myanmar_myansan" "input_view": "inputview.html#id=m17n:my_myansan&language=my&passwordLayout=us&name=keyboard_myanmar_myansan"
},
{
"name": "__MSG_keyboard_russian_phonetic_aatseel__",
"type": "ime",
"id": "vkd_ru_phone_aatseel",
"description": "",
"language": ["ru"],
"layouts": ["us"],
"input_view": "inputview.html#id=m17n:ru_phone_aatseel&language=ru&passwordLayout=us&name=keyboard_russian_phonetic_aatseel"
},
{
"name": "__MSG_keyboard_russian_phonetic_yazhert__",
"type": "ime",
"id": "vkd_ru_phone_yazhert",
"description": "",
"language": ["ru"],
"layouts": ["us"],
"input_view": "inputview.html#id=m17n:ru_phone_yazhert&language=ru&passwordLayout=us&name=keyboard_russian_phonetic_yazhert"
} }
], ],
"manifest_version": 2 "manifest_version": 2
......
...@@ -633,6 +633,16 @@ ...@@ -633,6 +633,16 @@
"layouts": ["ie"], "layouts": ["ie"],
"input_view": "inputview.html#id=ie.compact.qwerty&language=ga&passwordLayout=ie.compact.qwerty&name=keyboard_irish", "input_view": "inputview.html#id=ie.compact.qwerty&language=ga&passwordLayout=ie.compact.qwerty&name=keyboard_irish",
"options_page": "hmm_options.html?code=xkb:ie::ga" "options_page": "hmm_options.html?code=xkb:ie::ga"
},
{
"name": "__MSG_keyboard_maltese__",
"type": "ime",
"id": "xkb:mt::mlt",
"description": "",
"language": ["mt"],
"layouts": ["mt"],
"input_view": "inputview.html#id=mt&language=mt&passwordLayout=mt&name=keyboard_maltese",
"options_page": "hmm_options.html?code=xkb:mt::mlt"
} }
], ],
"manifest_version": 2 "manifest_version": 2
......
...@@ -35,12 +35,14 @@ const char* kLoginLayoutWhitelist[] = { ...@@ -35,12 +35,14 @@ const char* kLoginLayoutWhitelist[] = {
"gb(extd)", "gb(extd)",
"hr", "hr",
"hu", "hu",
"ie",
"is", "is",
"it", "it",
"jp", "jp",
"latam", "latam",
"lt", "lt",
"lv(apostrophe)", "lv(apostrophe)",
"mt",
"no", "no",
"pl", "pl",
"pt", "pt",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment