am 56169dcf: am 4022a799: Merge "Add subtype languages" into honeycomb

* commit '56169dcf6a4d0d84a0a3699427e2e593effec5bc':
  Add subtype languages
main
satok 2011-01-19 08:22:15 -08:00 committed by Android Git Automerger
commit 913f9919d2
5 changed files with 15 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -266,10 +266,14 @@
<string name="subtype_mode_es_voice">Spanish Voice</string>
<!-- Description for French voice input subtype [CHAR LIMIT=35] -->
<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] -->
<string name="subtype_mode_ja_voice">Japanese Voice</string>
<!-- Description for Korean voice input subtype [CHAR LIMIT=35] -->
<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] -->
<string name="subtype_mode_pl_voice">Polish Voice</string>
<!-- Description for Portuguese voice input subtype [CHAR LIMIT=35] -->

View File

@ -154,6 +154,11 @@
android:imeSubtypeLocale="fr"
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"
android:label="@string/subtype_mode_ko_voice"
android:imeSubtypeLocale="ko"
@ -164,6 +169,11 @@
android:imeSubtypeLocale="ja"
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"
android:label="@string/subtype_mode_pl_voice"
android:imeSubtypeLocale="pl"

View File

@ -41,7 +41,7 @@ import java.util.Locale;
import java.util.Map;
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 char LOCALE_SEPARATER = '_';