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

Commit fa1ac6a9 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Add Spanish (Latin America) subtype (es_419)"

parents 77dd17ad 9a924d7b

java/res/xml/method.xml

+2 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    eo: Esperanto/spanish

    es: Spanish/spanish

    es_US: Spanish (United States)/spanish

    (es_419: Spanish (Latin America)/qwerty)

    es_419: Spanish (Latin America)/spanish

    et_EE: Estonian (Estonia)/nordic

    eu_ES: Basque (Spain)/spanish

    fa: Persian/farsi
@@ -248,16 +248,14 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"

            android:isAsciiCapable="true"

    />

    <!--

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x623f9286"

            android:subtypeId="0xa23e5d19"

            android:imeSubtypeLocale="es_419"

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"

            android:isAsciiCapable="true"

    />

    -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0xec2d3955"

tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import java.util.ArrayList; 


@SmallTest

public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {

    private static final int NUMBER_OF_SUBTYPES = 68;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 43;

    private static final int NUMBER_OF_SUBTYPES = 69;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 44;

    private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;



    private static String toString(final ArrayList<InputMethodSubtype> subtypeList) {

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish419.java

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.inputmethod.keyboard.layout.tests;



import android.test.suitebuilder.annotation.SmallTest;



import com.android.inputmethod.keyboard.layout.LayoutBase;

import com.android.inputmethod.keyboard.layout.Spanish;



import java.util.Locale;



/**

 * es_419: Spanish (Latin America)/spanish

 */

@SmallTest

public class TestsSpanish419 extends LayoutTestsBase {

    private static final Locale LOCALE = new Locale("es", "419");

    private static final LayoutBase LAYOUT = new Spanish(new SpanishCustomizer(LOCALE));



    @Override

    LayoutBase getLayout() { return LAYOUT; }

}