diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-01 14:35:10 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-10-01 14:35:12 +0000 |
| commit | 47c9c32c107cff8b41479b395345b78c7175da59 (patch) | |
| tree | 048749aa0fcd96df38b0f7074826161ec05ad2a3 | |
| parent | 2910990065c3d17fddcd8238f2cd78cc34361d31 (diff) | |
| parent | 2a6176fc656aff50f1256b7e63109419d4fd607e (diff) | |
| download | latinime-47c9c32c107cff8b41479b395345b78c7175da59.tar.gz latinime-47c9c32c107cff8b41479b395345b78c7175da59.tar.xz latinime-47c9c32c107cff8b41479b395345b78c7175da59.zip | |
Merge "Enable preliminary Sinhara keyboard for dogfood"
| -rw-r--r-- | java/res/xml/method.xml | 6 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 10d8124be..8cc66425c 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -639,7 +639,6 @@ /> <!-- TODO: This Sinhala keyboard is a preliminary layout. This isn't based on the final specification. --> - <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x5c6b3bde" @@ -648,7 +647,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable" android:isAsciiCapable="false" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x8e94d413" @@ -707,8 +705,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" android:isAsciiCapable="false" /> - <!-- TODO: Enable ta_LK subtype when si_LK subtype is ready --> - <!-- + <!-- TODO: Enabling/Disabling ta_LK subtype must be aligned with si_LK subtype. --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x6ca12d84" @@ -717,7 +714,6 @@ 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/KeyboardLayoutSetSubtypesCountTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java index 503d43226..dc9531517 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java @@ -25,7 +25,7 @@ import java.util.ArrayList; @SmallTest public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase { - private static final int NUMBER_OF_SUBTYPES = 83; + private static final int NUMBER_OF_SUBTYPES = 85; private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50; private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2; |