diff options
| author |   Chieu Nguyen <cvnguyen@google.com> | 2015-03-18 17:38:26 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 17:38:26 +0000 |
| commit | add004983a548063368cf7dc91728ec137940a1f (patch) | |
| tree | 5fcf4362a650804d537dbd5ddcf6bfd0a493e9c5 | |
| parent | c6b84443d5bb7787804c63f7aec27c0bd275103a (diff) | |
| parent | d4ce5e944b849cbae65aa62f99bf2ee0796fbff3 (diff) | |
| download | latinime-add004983a548063368cf7dc91728ec137940a1f.tar.gz latinime-add004983a548063368cf7dc91728ec137940a1f.tar.xz latinime-add004983a548063368cf7dc91728ec137940a1f.zip | |
am d4ce5e94: Disable si_LK and ta_LK subtypes.
* commit 'd4ce5e944b849cbae65aa62f99bf2ee0796fbff3':
Disable si_LK and ta_LK subtypes.
| -rw-r--r-- | java/res/xml/method.xml | 4 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 33a10fa8f..64929adf1 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -626,6 +626,7 @@ /> <!-- TODO: This Sinhala keyboard is a preliminary layout. This isn't based on the final specification. --> + <!-- si_LK is currently disabled due to lack of combination rules. <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x5c6b3bde" @@ -634,6 +635,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable" android:isAsciiCapable="false" /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x8e94d413" @@ -693,6 +695,7 @@ android:isAsciiCapable="false" /> <!-- TODO: Enabling/Disabling ta_LK subtype must be aligned with si_LK subtype. --> + <!-- ta_LK disabled alongside si_LK subtype due to lack of combination rules. <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x6ca12d84" @@ -701,6 +704,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" android:isAsciiCapable="false" /> + !--> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x785abbd9" diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java index 6e49c5953..72872ba66 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java @@ -16,7 +16,7 @@ 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.Symbols; @@ -30,7 +30,7 @@ import java.util.Locale; /** * ta_LK: Tamil (Sri Lanka)/tamil */ -@SmallTest +@Suppress public final class TestsTamilLK extends LayoutTestsBase { private static final Locale LOCALE = new Locale("ta", "LK"); private static final LayoutBase LAYOUT = new Tamil(new TamilLKCustomizer(LOCALE)); |