Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e44ce053 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

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

* commit '8a5b176f':
  Add Spanish United States keyboard (DO NOT MERGE)
parents 333881c4 8a5b176f

java/res/xml/method.xml

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
    en_GB: English Great Britain/qwerty

    eo: Esperanto/spanish

    es: Spanish/spanish

    es_US: Spanish United States/spanish

    et: Estonian/nordic

    fa: Persian/arabic

    fi: Finnish/nordic
@@ -182,6 +183,13 @@ 
            android:imeSubtypeMode="keyboard"

            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"

            android:label="@string/subtype_generic"

            android:subtypeId="-332580523"

java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java

+8 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment { 
    }



    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) {

            super(context, android.R.layout.simple_spinner_item);

            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -94,6 +97,11 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment { 
            final int count = imi.getSubtypeCount();

            for (int i = 0; i < count; 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)) {

                    items.add(createItem(context, subtype.getLocale()));

                }