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

am 8a5b176f: am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE) 

* commit '8a5b176f655a46f1c575886a7d3a3c1120c91b29':
  Add Spanish United States keyboard (DO NOT MERGE)
main
Tadashi G. Takaoka 2012-11-20 18:58:29 -08:00 committed by Android Git Automerger
parent 333881c434 8a5b176f65
commit e44ce053e7
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@
en_GB: English Great Britain/qwerty en_GB: English Great Britain/qwerty
eo: Esperanto/spanish eo: Esperanto/spanish
es: Spanish/spanish es: Spanish/spanish
es_US: Spanish United States/spanish
et: Estonian/nordic et: Estonian/nordic
fa: Persian/arabic fa: Persian/arabic
fi: Finnish/nordic fi: Finnish/nordic
@ -182,6 +183,13 @@
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
android:subtypeId="-2066550842"
android:imeSubtypeLocale="es_US"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="-332580523" android:subtypeId="-332580523"

8
java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java
View File

@ -85,6 +85,9 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment {
} }
static final class SubtypeLocaleAdapter extends ArrayAdapter<SubtypeLocaleItem> { static final class SubtypeLocaleAdapter extends ArrayAdapter<SubtypeLocaleItem> {
private static final String TAG = SubtypeLocaleAdapter.class.getSimpleName();
private static final boolean DEBUG_SUBTYPE_ID = false;
public SubtypeLocaleAdapter(final Context context) { public SubtypeLocaleAdapter(final Context context) {
super(context, android.R.layout.simple_spinner_item); super(context, android.R.layout.simple_spinner_item);
setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@ -94,6 +97,11 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment {
final int count = imi.getSubtypeCount(); final int count = imi.getSubtypeCount();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
final InputMethodSubtype subtype = imi.getSubtypeAt(i); final InputMethodSubtype subtype = imi.getSubtypeAt(i);
if (DEBUG_SUBTYPE_ID) {
android.util.Log.d(TAG, String.format("%-6s 0x%08x %11d %s",
subtype.getLocale(), subtype.hashCode(), subtype.hashCode(),
SubtypeLocale.getSubtypeDisplayName(subtype, context.getResources())));
}
if (subtype.containsExtraValueKey(ASCII_CAPABLE)) { if (subtype.containsExtraValueKey(ASCII_CAPABLE)) {
items.add(createItem(context, subtype.getLocale())); items.add(createItem(context, subtype.getLocale()));
} }