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

am 8f70552a: Add preliminary subtypes disabled for L-preview 

* commit '8f70552a21f5e2387d3fbc0f7f569c2a2a8464d6':
  Add preliminary subtypes disabled for L-preview
main
Tadashi G. Takaoka 2014-06-27 07:38:08 +00:00 committed by Android Git Automerger
parent 6fc93f990f 8f70552a21
commit 6bd59885ee
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,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 # This is a preliminary keyboard layout. (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
@ -333,7 +333,6 @@
/> />
<!-- TODO: This hindi_compact keyboard is a preliminary layout. <!-- TODO: This hindi_compact keyboard is a preliminary layout.
This isn't based on the final specification. --> 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_compact" android:label="@string/subtype_generic_compact"
android:subtypeId="0xe49c89a1" android:subtypeId="0xe49c89a1"
@ -342,7 +341,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi_compact,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi_compact,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="0x35b7526a" android:subtypeId="0x35b7526a"
@ -483,7 +481,6 @@
/> />
<!-- TODO: This marathi keyboard is a preliminary layout. <!-- TODO: This marathi keyboard is a preliminary layout.
This isn't based on the final specification. --> 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="0x747b9f03" android:subtypeId="0x747b9f03"
@ -492,7 +489,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=marathi,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=marathi,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="0x84c87c61" android:subtypeId="0x84c87c61"
@ -503,7 +499,6 @@
/> />
<!-- TODO: This Myanmar keyboard is a preliminary layout. <!-- TODO: This Myanmar keyboard is a preliminary layout.
This isn't based on the final specification. --> 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="0xea266ea4" android:subtypeId="0xea266ea4"
@ -512,7 +507,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable,CombiningRules=MyanmarReordering" android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable,CombiningRules=MyanmarReordering"
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="0x3f12ee14" android:subtypeId="0x3f12ee14"
@ -593,6 +587,8 @@
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"

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 = 68; private static final int NUMBER_OF_SUBTYPES = 72;
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/TestsHindiCompact.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.Suppress; import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.HindiCompact; import com.android.inputmethod.keyboard.layout.HindiCompact;
import com.android.inputmethod.keyboard.layout.HindiCompact.HindiCompactCustomizer; import com.android.inputmethod.keyboard.layout.HindiCompact.HindiCompactCustomizer;
@ -27,7 +27,7 @@ import java.util.Locale;
/** /**
* hi: Hindi/hindi_compact * hi: Hindi/hindi_compact
*/ */
@Suppress @SmallTest
public final class TestsHindiCompact extends LayoutTestsBase { public final class TestsHindiCompact extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("hi"); private static final Locale LOCALE = new Locale("hi");
private static final LayoutBase LAYOUT = new HindiCompact(new HindiCompactCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new HindiCompact(new HindiCompactCustomizer(LOCALE));

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.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.Suppress; import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase; import com.android.inputmethod.keyboard.layout.LayoutBase;
import com.android.inputmethod.keyboard.layout.Marathi; import com.android.inputmethod.keyboard.layout.Marathi;
@ -27,7 +27,7 @@ import java.util.Locale;
/** /**
* mr_IN: Marathi (India)/marathi * mr_IN: Marathi (India)/marathi
*/ */
@Suppress @SmallTest
public final class TestsMarathiIN extends LayoutTestsBase { public final class TestsMarathiIN extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("mr", "IN"); private static final Locale LOCALE = new Locale("mr", "IN");
private static final LayoutBase LAYOUT = new Marathi(new MarathiCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Marathi(new MarathiCustomizer(LOCALE));

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMyanmarMM.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.Suppress; import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase; import com.android.inputmethod.keyboard.layout.LayoutBase;
import com.android.inputmethod.keyboard.layout.Myanmar; import com.android.inputmethod.keyboard.layout.Myanmar;
@ -27,7 +27,7 @@ import java.util.Locale;
/** /**
* my_MM: Myanmar (Myanmar)/myanmar * my_MM: Myanmar (Myanmar)/myanmar
*/ */
@Suppress @SmallTest
public final class TestsMyanmarMM extends LayoutTestsBase { public final class TestsMyanmarMM extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("my", "MM"); private static final Locale LOCALE = new Locale("my", "MM");
private static final LayoutBase LAYOUT = new Myanmar(new MyanmarCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Myanmar(new MyanmarCustomizer(LOCALE));