Merge "Add new locales for the spell checker." into jb-dev

This commit is contained in:
Jean Chalard 2012-05-24 03:13:56 -07:00 committed by Android (Google) Code Review
commit 69897af20d
2 changed files with 22 additions and 0 deletions

View file

@ -27,6 +27,14 @@
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeLocale="en" android:subtypeLocale="en"
/> />
<subtype
android:label="@string/subtype_generic"
android:subtypeLocale="en_US"
/>
<subtype
android:label="@string/subtype_generic"
android:subtypeLocale="en_GB"
/>
<subtype <subtype
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeLocale="fr" android:subtypeLocale="fr"
@ -55,4 +63,12 @@
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeLocale="nl" android:subtypeLocale="nl"
/> />
<subtype
android:label="@string/subtype_generic"
android:subtypeLocale="hr"
/>
<subtype
android:label="@string/subtype_generic"
android:subtypeLocale="pt_BR"
/>
</spell-checker> </spell-checker>

View file

@ -102,13 +102,19 @@ public class AndroidSpellCheckerService extends SpellCheckerService
// will never have any suggestions, so it makes no sense checking them. // will never have any suggestions, so it makes no sense checking them.
mLanguageToScript = new TreeMap<String, Integer>(); mLanguageToScript = new TreeMap<String, Integer>();
mLanguageToScript.put("en", SCRIPT_LATIN); mLanguageToScript.put("en", SCRIPT_LATIN);
mLanguageToScript.put("en_US", SCRIPT_LATIN);
mLanguageToScript.put("en_GB", SCRIPT_LATIN);
mLanguageToScript.put("fr", SCRIPT_LATIN); mLanguageToScript.put("fr", SCRIPT_LATIN);
mLanguageToScript.put("de", SCRIPT_LATIN); mLanguageToScript.put("de", SCRIPT_LATIN);
mLanguageToScript.put("nl", SCRIPT_LATIN); mLanguageToScript.put("nl", SCRIPT_LATIN);
mLanguageToScript.put("cs", SCRIPT_LATIN); mLanguageToScript.put("cs", SCRIPT_LATIN);
mLanguageToScript.put("es", SCRIPT_LATIN); mLanguageToScript.put("es", SCRIPT_LATIN);
mLanguageToScript.put("it", SCRIPT_LATIN); mLanguageToScript.put("it", SCRIPT_LATIN);
mLanguageToScript.put("hr", SCRIPT_LATIN);
mLanguageToScript.put("pt_BR", SCRIPT_LATIN);
mLanguageToScript.put("ru", SCRIPT_CYRILLIC); mLanguageToScript.put("ru", SCRIPT_CYRILLIC);
// TODO: Make a persian proximity, and activate the Farsi subtype.
// mLanguageToScript.put("fa", SCRIPT_PERSIAN);
} }
@Override public void onCreate() { @Override public void onCreate() {