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

Merge "Add subtype languages" into honeycomb

main
satok 2011-01-19 08:17:05 -08:00 committed by Android (Google) Code Review
parent 89764ad4ac be324535f6
commit 4022a79957
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

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

@ -266,10 +266,14 @@
<string name="subtype_mode_es_voice">Spanish Voice</string> <string name="subtype_mode_es_voice">Spanish Voice</string>
<!-- Description for French voice input subtype [CHAR LIMIT=35] --> <!-- Description for French voice input subtype [CHAR LIMIT=35] -->
<string name="subtype_mode_fr_voice">French Voice</string> <string name="subtype_mode_fr_voice">French Voice</string>
<!-- Description for Italian voice input subtype [CHAR LIMIT=35] -->
<string name="subtype_mode_it_voice">Italian Voice</string>
<!-- Description for Japanese voice input subtype [CHAR LIMIT=35] --> <!-- Description for Japanese voice input subtype [CHAR LIMIT=35] -->
<string name="subtype_mode_ja_voice">Japanese Voice</string> <string name="subtype_mode_ja_voice">Japanese Voice</string>
<!-- Description for Korean voice input subtype [CHAR LIMIT=35] --> <!-- Description for Korean voice input subtype [CHAR LIMIT=35] -->
<string name="subtype_mode_ko_voice">Korean Voice</string> <string name="subtype_mode_ko_voice">Korean Voice</string>
<!-- Description for Dutch voice input subtype [CHAR LIMIT=35] -->
<string name="subtype_mode_nl_voice">Dutch Voice</string>
<!-- Description for Polish voice input subtype [CHAR LIMIT=35] --> <!-- Description for Polish voice input subtype [CHAR LIMIT=35] -->
<string name="subtype_mode_pl_voice">Polish Voice</string> <string name="subtype_mode_pl_voice">Polish Voice</string>
<!-- Description for Portuguese voice input subtype [CHAR LIMIT=35] --> <!-- Description for Portuguese voice input subtype [CHAR LIMIT=35] -->

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

@ -154,6 +154,11 @@
android:imeSubtypeLocale="fr" android:imeSubtypeLocale="fr"
android:imeSubtypeMode="voice" android:imeSubtypeMode="voice"
/> />
<subtype android:icon="@drawable/ic_subtype_mic_it"
android:label="@string/subtype_mode_it_voice"
android:imeSubtypeLocale="it"
android:imeSubtypeMode="voice"
/>
<subtype android:icon="@drawable/ic_subtype_mic_ko" <subtype android:icon="@drawable/ic_subtype_mic_ko"
android:label="@string/subtype_mode_ko_voice" android:label="@string/subtype_mode_ko_voice"
android:imeSubtypeLocale="ko" android:imeSubtypeLocale="ko"
@ -164,6 +169,11 @@
android:imeSubtypeLocale="ja" android:imeSubtypeLocale="ja"
android:imeSubtypeMode="voice" android:imeSubtypeMode="voice"
/> />
<subtype android:icon="@drawable/ic_subtype_mic_nl"
android:label="@string/subtype_mode_nl_voice"
android:imeSubtypeLocale="nl"
android:imeSubtypeMode="voice"
/>
<subtype android:icon="@drawable/ic_subtype_mic_pl" <subtype android:icon="@drawable/ic_subtype_mic_pl"
android:label="@string/subtype_mode_pl_voice" android:label="@string/subtype_mode_pl_voice"
android:imeSubtypeLocale="pl" android:imeSubtypeLocale="pl"

2
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
View File

@ -41,7 +41,7 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
public class SubtypeSwitcher { public class SubtypeSwitcher {
private static final boolean DBG = false; private static final boolean DBG = LatinImeLogger.sDBG;
private static final String TAG = "SubtypeSwitcher"; private static final String TAG = "SubtypeSwitcher";
private static final char LOCALE_SEPARATER = '_'; private static final char LOCALE_SEPARATER = '_';