diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-06-17 08:59:57 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 08:59:57 -0700 |
| commit | e6371769ad26c5eff016acbfd37a3eb972b6741c (patch) | |
| tree | 1401c0373ae9a9349d0ca5c242100f3584fb0176 /java | |
| parent | 23eb0fa0b582c538e130fe2900e6241d0fb4a6cd (diff) | |
| parent | 1b580e3f1a2ad2ceacbab4940ce4b843ac8c6ff5 (diff) | |
| download | latinime-e6371769ad26c5eff016acbfd37a3eb972b6741c.tar.gz latinime-e6371769ad26c5eff016acbfd37a3eb972b6741c.tar.xz latinime-e6371769ad26c5eff016acbfd37a3eb972b6741c.zip | |
Merge "Add Finnish and Hungarian keyboard subtype"
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 3d03271ad..2093f6461 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -258,12 +258,16 @@ <string name="subtype_mode_en_US_keyboard">English (US) Keyboard</string> <!-- Description for Spanish keyboard subtype [CHAR LIMIT=35] --> <string name="subtype_mode_es_keyboard">Spanish Keyboard</string> + <!-- Description for Finnish keyboard subtype [CHAR LIMIT=35] --> + <string name="subtype_mode_fi_keyboard">Finnish Keyboard</string> <!-- Description for French keyboard subtype [CHAR LIMIT=35] --> <string name="subtype_mode_fr_keyboard">French Keyboard</string> <!-- Description for French (Canada) keyboard subtype [CHAR LIMIT=35] --> <string name="subtype_mode_fr_CA_keyboard">French (Canada) Keyboard</string> <!-- Description for French (Switzerland) keyboard subtype [CHAR LIMIT=35] --> <string name="subtype_mode_fr_CH_keyboard">French (Switzerland) Keyboard</string> + <!-- Description for Hungarian keyboard subtype [CHAR LIMIT=35] --> + <string name="subtype_mode_hu_keyboard">Hungarian Keyboard</string> <!-- Description for Hebrew keyboard subtype [CHAR LIMIT=35] --> <!-- Java uses the deprecated "iw" code instead of the standard "he" code --> <string name="subtype_mode_iw_keyboard">Hebrew Keyboard</string> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index aba6974a8..61fd1ce99 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -20,7 +20,7 @@ <!-- The attributes in this XML file provide configuration information --> <!-- for the Input Method Manager. --> -<!-- Keyboard: en_US, en_GB, cs, da, de, es, es_US, fr, fr_CA, fr_CH, it, nb, nl, sr, sv --> +<!-- Keyboard: en_US, en_GB, ar, cs, da, de, es, es_US, fi, fr, fr_CA, fr_CH, hu, it, iw, nb, nl, pl, pt, ru, sr, sv --> <!-- Voice: af, cs, da, de, en, es, fr, it, ja, ko, nl, pl, pt, ru, tr, yue, zh, zu --> <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> <!-- TODO: use <lang>_mic icon instead of a common mic icon. --> @@ -91,6 +91,11 @@ <!-- android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" --> <!-- /> --> <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_mode_fi_keyboard" + android:imeSubtypeLocale="fi" + android:imeSubtypeMode="keyboard" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_mode_fr_keyboard" android:imeSubtypeLocale="fr" android:imeSubtypeMode="keyboard" @@ -112,6 +117,11 @@ android:imeSubtypeMode="keyboard" /> <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_mode_hu_keyboard" + android:imeSubtypeLocale="hu" + android:imeSubtypeMode="keyboard" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_mode_it_keyboard" android:imeSubtypeLocale="it" android:imeSubtypeMode="keyboard" |