commit d4ce5e944b849cbae65aa62f99bf2ee0796fbff3
author Chieu Nguyen <cvnguyen@google.com> Wed Mar 18 09:57:24 2015 -0700
committer Chieu Nguyen <cvnguyen@google.com> Wed Mar 18 10:24:07 2015 -0700
tree 4342ee3f0d6011424b79ee54362c3db0edcde5b0
parent e2da4c6ab8455459429fe8b5922b7bba41b4da6e

Disable si_LK and ta_LK subtypes.

Bug: 19815109
Change-Id: I3681fcf17752defdf3c1bacff9dadb60df2468ab

java/res/xml/method.xml

diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 33a10fa..64929ad 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"

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

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 6e49c59..72872ba 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 @@
 /**
  * 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));