nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add fr_CH keyboard subtype"

main
Tadashi G. Takaoka 2010-12-01 05:27:26 -08:00 committed by Android (Google) Code Review
parent f987289b59 e6f8bb04b6
commit 3c308de91c
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java/res/drawable/ic_subtype_keyboard_fr_ch.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
java/res/drawable/ic_subtype_us_keyboard.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

1
java/res/values/strings.xml
View File

@ -402,6 +402,7 @@
<string name="subtype_mode_es_US_keyboard">Spanish (United States) Keyboard</string>
<string name="subtype_mode_fr_keyboard">French Keyboard</string>
<string name="subtype_mode_fr_CA_keyboard">French (Canada) Keyboard</string>
<string name="subtype_mode_fr_CH_keyboard">French (Switzerland) Keyboard</string>
<string name="subtype_mode_it_keyboard">Italian Keyboard</string>
<string name="subtype_mode_nb_keyboard">Norwegian Keyboard</string>
<string name="subtype_mode_nl_keyboard">Dutch Keyboard</string>

7
java/res/xml/method.xml
View File

@ -20,7 +20,7 @@
<!-- The attributes in this XML file provide configuration information -->
<!-- for the Input Method Manager. -->
<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, it, nb, nl, sr, sv -->
<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, fr_CH, it, nb, nl, sr, sv -->
<!-- Voice: cs, da, de, en_AU, en_GB, en_IN, en_NZ, en_US, es, fr, ko, ja, pl, pt, ru, tr, zh_CN, zh_TW -->
<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
<!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
@ -74,6 +74,11 @@
android:imeSubtypeLocale="fr_CA"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard_fr_ch"
android:label="@string/subtype_mode_fr_CH_keyboard"
android:imeSubtypeLocale="fr_CH"
android:imeSubtypeMode="keyboard"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard_it"
android:label="@string/subtype_mode_it_keyboard"
android:imeSubtypeLocale="it"