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

am 37cb7a73: Merge "Disable Hinglish locale." 

* commit '37cb7a7371fbd0bcb1095b6975ec875f7e28cda4':
  Disable Hinglish locale.
main
Chieu Nguyen 2015-03-24 01:39:12 +00:00 committed by Android Git Automerger
parent b84617af20 37cb7a7371
commit 0880e4143a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,6 +366,7 @@
/> />
<!-- TODO: This Hinglish keyboard is a preliminary layout. <!-- TODO: This Hinglish keyboard is a preliminary layout.
This isn't based on the final specification. --> This isn't based on the final specification. -->
<!-- Disabled because there is no LM yet, and this layout does not offer anything different.
<subtype android:icon="@drawable/ic_ime_switcher_dark" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_hi_ZZ" android:label="@string/subtype_hi_ZZ"
android:subtypeId="0x352eb37c" android:subtypeId="0x352eb37c"
@ -374,6 +375,7 @@
android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable" android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,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="0x35b7526a" android:subtypeId="0x35b7526a"

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

@ -27,8 +27,8 @@ import java.util.ArrayList;
@SmallTest @SmallTest
public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase { public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {
private static final int NUMBER_OF_SUBTYPES = 82; private static final int NUMBER_OF_SUBTYPES = 81;
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50; private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 49;
private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2; private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;
@Override @Override

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

@ -16,7 +16,7 @@
package com.android.inputmethod.keyboard.layout.tests; package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.Suppress;
import com.android.inputmethod.keyboard.layout.LayoutBase; import com.android.inputmethod.keyboard.layout.LayoutBase;
import com.android.inputmethod.keyboard.layout.Qwerty; import com.android.inputmethod.keyboard.layout.Qwerty;
@ -30,7 +30,7 @@ import java.util.Locale;
/* /*
* hi_ZZ: Hinglish/qwerty * hi_ZZ: Hinglish/qwerty
*/ */
@SmallTest @Suppress
public final class TestsHinglish extends LayoutTestsBase { public final class TestsHinglish extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("hi", "ZZ"); private static final Locale LOCALE = new Locale("hi", "ZZ");
private static final LayoutBase LAYOUT = new Qwerty(new HinglishCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Qwerty(new HinglishCustomizer(LOCALE));