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

am d4ce5e94: Disable si_LK and ta_LK subtypes. 

* commit 'd4ce5e944b849cbae65aa62f99bf2ee0796fbff3':
  Disable si_LK and ta_LK subtypes.
main
Chieu Nguyen 2015-03-18 17:38:26 +00:00 committed by Android Git Automerger
parent c6b84443d5 d4ce5e944b
commit add004983a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,6 +626,7 @@
/> />
<!-- TODO: This Sinhala keyboard is a preliminary layout. <!-- TODO: This Sinhala keyboard is a preliminary layout.
This isn't based on the final specification. --> 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" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x5c6b3bde" android:subtypeId="0x5c6b3bde"
@ -634,6 +635,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
-->
<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="0x8e94d413" android:subtypeId="0x8e94d413"
@ -693,6 +695,7 @@
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<!-- TODO: Enabling/Disabling ta_LK subtype must be aligned with si_LK subtype. --> <!-- 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" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x6ca12d84" android:subtypeId="0x6ca12d84"
@ -701,6 +704,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
!-->
<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="0x785abbd9" android:subtypeId="0x785abbd9"

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.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.Symbols; import com.android.inputmethod.keyboard.layout.Symbols;
@ -30,7 +30,7 @@ import java.util.Locale;
/** /**
* ta_LK: Tamil (Sri Lanka)/tamil * ta_LK: Tamil (Sri Lanka)/tamil
*/ */
@SmallTest @Suppress
public final class TestsTamilLK extends LayoutTestsBase { public final class TestsTamilLK extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("ta", "LK"); private static final Locale LOCALE = new Locale("ta", "LK");
private static final LayoutBase LAYOUT = new Tamil(new TamilLKCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Tamil(new TamilLKCustomizer(LOCALE));