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

am c9add10c: (DO NOT MERGE) Disable Sinhala keyboard for L-release

Browse source 
* commit 'c9add10c38aabefe41979ec8b0098f3589df8acd':
  (DO NOT MERGE) Disable Sinhala keyboard for L-release
This commit is contained in:
Tadashi G. Takaoka 2014-08-11 11:27:52 +00:00 committed by Android Git Automerger
commit 35c099de24
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
java/res/xml/method.xml
View file

@ -84,7 +84,7 @@
pt_PT: Portuguese (Portugal)/qwerty pt_PT: Portuguese (Portugal)/qwerty
ro: Romanian/qwerty ro: Romanian/qwerty
ru: Russian/east_slavic ru: Russian/east_slavic
si_LK: Sinhala (Sri Lanka)/sinhala (si_LK: Sinhala (Sri Lanka)/sinhala) # This is a preliminary keyboard layout.
sk: Slovak/qwerty sk: Slovak/qwerty
sl: Slovenian/qwerty sl: Slovenian/qwerty
sr: Serbian/south_slavic sr: Serbian/south_slavic
@ -92,7 +92,7 @@
sv: Swedish/nordic sv: Swedish/nordic
sw: Swahili/qwerty sw: Swahili/qwerty
ta_IN: Tamil (India)/tamil ta_IN: Tamil (India)/tamil
ta_LK: Tamil (Sri Lanka)/tamil (ta_LK: Tamil (Sri Lanka)/tamil) # Disabled in conjunction with si_LK.
ta_SG: Tamil (Singapore)/tamil ta_SG: Tamil (Singapore)/tamil
te_IN: Telugu (India)/telugu te_IN: Telugu (India)/telugu
th: Thai/thai th: Thai/thai
@ -616,6 +616,9 @@
android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<!-- TODO: This Sinhala keyboard is a preliminary layout.
This isn't based on the final specification. -->
<!--
<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"
@ -624,6 +627,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"
@ -690,6 +694,8 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<!-- TODO: Enable ta_LK subtype when si_LK subtype is ready -->
<!--
<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"
@ -698,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"

2
tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java
View file

@ -25,7 +25,7 @@ import java.util.ArrayList;
@SmallTest @SmallTest
public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase { public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {
private static final int NUMBER_OF_SUBTYPES = 78; private static final int NUMBER_OF_SUBTYPES = 76;
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 45; private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 45;
private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2; private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.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.Sinhala; import com.android.inputmethod.keyboard.layout.Sinhala;
@ -27,7 +27,7 @@ import java.util.Locale;
/** /**
* si_LK: Sinhala (Sri Lanka)/sinhala * si_LK: Sinhala (Sri Lanka)/sinhala
*/ */
@SmallTest @Suppress
public final class TestsSinhalaLK extends LayoutTestsBase { public final class TestsSinhalaLK extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("si", "LK"); private static final Locale LOCALE = new Locale("si", "LK");
private static final LayoutBase LAYOUT = new Sinhala(new SinhalaCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Sinhala(new SinhalaCustomizer(LOCALE));

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));