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

am fa1ac6a9: Merge "Add Spanish (Latin America) subtype (es_419)" 

* commit 'fa1ac6a9db077f460018afc6aebbf33e0af3e1c5':
  Add Spanish (Latin America) subtype (es_419)
main
Tadashi G. Takaoka 2014-04-09 10:23:33 +00:00 committed by Android Git Automerger
parent 08da006441 fa1ac6a9db
commit 3498e48e17
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@
eo: Esperanto/spanish eo: Esperanto/spanish
es: Spanish/spanish es: Spanish/spanish
es_US: Spanish (United States)/spanish es_US: Spanish (United States)/spanish
(es_419: Spanish (Latin America)/qwerty) es_419: Spanish (Latin America)/spanish
et_EE: Estonian (Estonia)/nordic et_EE: Estonian (Estonia)/nordic
eu_ES: Basque (Spain)/spanish eu_ES: Basque (Spain)/spanish
fa: Persian/farsi fa: Persian/farsi
@ -248,16 +248,14 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
android:isAsciiCapable="true" android:isAsciiCapable="true"
/> />
<!--
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x623f9286" android:subtypeId="0xa23e5d19"
android:imeSubtypeLocale="es_419" android:imeSubtypeLocale="es_419"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
android:isAsciiCapable="true" android:isAsciiCapable="true"
/> />
-->
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xec2d3955" android:subtypeId="0xec2d3955"

4
tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java
View File

@ -25,8 +25,8 @@ import java.util.ArrayList;
@SmallTest @SmallTest
public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase { public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {
private static final int NUMBER_OF_SUBTYPES = 68; private static final int NUMBER_OF_SUBTYPES = 69;
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 43; private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 44;
private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2; private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;
private static String toString(final ArrayList<InputMethodSubtype> subtypeList) { private static String toString(final ArrayList<InputMethodSubtype> subtypeList) {

36
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish419.java Normal file
View File

@ -0,0 +1,36 @@
/*
* 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; }
}