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

am 924b8fd0: Merge "Enable preliminary subtypes for F-release" 

* commit '924b8fd0fa456a084358ce916ac2b637b915946e':
  Enable preliminary subtypes for F-release
main
Tadashi G. Takaoka 2014-10-23 07:54:33 +00:00 committed by Android Git Automerger
parent 845bedd230 924b8fd0fa
commit 3af7fd0a91
10 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@
be_BY: Belarusian (Belarus)/east_slavic be_BY: Belarusian (Belarus)/east_slavic
bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian
bg: Bulgarian/bulgarian_bds bg: Bulgarian/bulgarian_bds
(bn_BD: Bengali (Bangladesh)/bengali_akkhor) # This is a preliminary keyboard layout. bn_BD: Bengali (Bangladesh)/bengali_akkhor # This is a preliminary keyboard layout.
bn_IN: Bengali (India)/bengali bn_IN: Bengali (India)/bengali
ca: Catalan/spanish ca: Catalan/spanish
cs: Czech/qwertz cs: Czech/qwertz
@ -53,7 +53,7 @@
gl_ES: Galician (Spain)/spanish gl_ES: Galician (Spain)/spanish
hi: Hindi/hindi hi: Hindi/hindi
hi: Hindi/hindi_compact hi: Hindi/hindi_compact
(hi_ZZ: Hinglish/qwerty) # This is a preliminary keyboard layout. hi_ZZ: Hinglish/qwerty # This is a preliminary keyboard layout.
hr: Croatian/qwertz hr: Croatian/qwertz
hu: Hungarian/qwertz hu: Hungarian/qwertz
hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic
@ -75,7 +75,7 @@
mn_MN: Mongolian (Mongolia)/mongolian mn_MN: Mongolian (Mongolia)/mongolian
mr_IN: Marathi (India)/marathi mr_IN: Marathi (India)/marathi
ms_MY: Malay (Malaysia)/qwerty ms_MY: Malay (Malaysia)/qwerty
(my_MM: Myanmar (Myanmar)/myanmar) # This is a preliminary keyboard layout. my_MM: Myanmar (Myanmar)/myanmar # This is a preliminary keyboard layout.
nb: Norwegian Bokmål/nordic nb: Norwegian Bokmål/nordic
ne_NP: Nepali (Nepal) Romanized/nepali_romanized ne_NP: Nepali (Nepal) Romanized/nepali_romanized
ne_NP: Nepali (Nepal) Traditional/nepali_traditional ne_NP: Nepali (Nepal) Traditional/nepali_traditional
@ -86,22 +86,22 @@
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
(sr_ZZ: Serbian (Latin)/serbian_qwertz) # This is a preliminary keyboard layout. sr_ZZ: Serbian (Latin)/serbian_qwertz # This is a preliminary keyboard layout.
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) # Disabled in conjunction with si_LK. 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
tl: Tagalog/spanish tl: Tagalog/spanish
tr: Turkish/qwerty tr: Turkish/qwerty
uk: Ukrainian/east_slavic uk: Ukrainian/east_slavic
(uz_UZ: Uzbek (Uzbekistan)/uzbek) # This is a preliminary keyboard layout. uz_UZ: Uzbek (Uzbekistan)/uzbek # This is a preliminary keyboard layout.
vi: Vietnamese/qwerty vi: Vietnamese/qwerty
zu: Zulu/qwerty zu: Zulu/qwerty
zz: QWERTY/qwerty zz: QWERTY/qwerty
@ -183,7 +183,6 @@
/> />
<!-- TODO: This Bengali (Bangladesh) keyboard is a preliminary layout. <!-- TODO: This Bengali (Bangladesh) 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="0xa2144b0c" android:subtypeId="0xa2144b0c"
@ -192,7 +191,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_akkhor,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_akkhor,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="0xbff5986c" android:subtypeId="0xbff5986c"
@ -371,7 +369,6 @@
/> />
<!-- TODO: This Hinglish keyboard is a preliminary layout. <!-- TODO: This Hinglish 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_hi_ZZ" android:label="@string/subtype_hi_ZZ"
android:subtypeId="0x352eb37c" android:subtypeId="0x352eb37c"
@ -380,7 +377,6 @@
android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable" android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable"
android:isAsciiCapable="true" android:isAsciiCapable="true"
/> />
-->
<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"
@ -553,7 +549,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"
@ -562,7 +557,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"
@ -645,7 +639,6 @@
/> />
<!-- 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. -->
<!--
<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"
@ -654,7 +647,6 @@
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"
@ -681,7 +673,6 @@
/> />
<!-- TODO: This Serbian Latin keyboard is a preliminary layout. <!-- TODO: This Serbian Latin 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_sr_ZZ" android:label="@string/subtype_sr_ZZ"
android:subtypeId="0xf4a5569c" android:subtypeId="0xf4a5569c"
@ -690,7 +681,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=serbian_qwertz,AsciiCapable,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=serbian_qwertz,AsciiCapable,EmojiCapable"
android:isAsciiCapable="true" android:isAsciiCapable="true"
/> />
-->
<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="0x48b4ff43" android:subtypeId="0x48b4ff43"
@ -716,7 +706,6 @@
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. -->
<!--
<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"
@ -725,7 +714,6 @@
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"
@ -776,7 +764,6 @@
/> />
<!-- TODO: This Uzbek keyboard is a preliminary layout. <!-- TODO: This Uzbek 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="0xad5cf7f6" android:subtypeId="0xad5cf7f6"
@ -785,7 +772,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=uzbek,AsciiCapable,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=uzbek,AsciiCapable,EmojiCapable"
android:isAsciiCapable="true" android:isAsciiCapable="true"
/> />
-->
<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="0x93972eee" android:subtypeId="0x93972eee"

4
tests/src/com/android/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
View File

@ -27,8 +27,8 @@ 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 = 85;
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 47; private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50;
private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2; private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;
@Override @Override

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.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.BengaliAkkhor; import com.android.inputmethod.keyboard.layout.BengaliAkkhor;
import com.android.inputmethod.keyboard.layout.LayoutBase; import com.android.inputmethod.keyboard.layout.LayoutBase;
@ -29,7 +29,7 @@ import java.util.Locale;
/** /**
* bn_BD: Bengali (Bangladesh)/bengali_akkhor * bn_BD: Bengali (Bangladesh)/bengali_akkhor
*/ */
@Suppress @SmallTest
public final class TestsBengaliBD extends LayoutTestsBase { public final class TestsBengaliBD extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("bn", "BD"); private static final Locale LOCALE = new Locale("bn", "BD");
private static final LayoutBase LAYOUT = new BengaliAkkhor(new BengaliBDCustomzier(LOCALE)); private static final LayoutBase LAYOUT = new BengaliAkkhor(new BengaliBDCustomzier(LOCALE));

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHinglish.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.Qwerty; import com.android.inputmethod.keyboard.layout.Qwerty;
@ -30,7 +30,7 @@ import java.util.Locale;
/* /*
* hi_ZZ: Hinglish/qwerty * hi_ZZ: Hinglish/qwerty
*/ */
@Suppress @SmallTest
public final class TestsHinglish extends LayoutTestsBase { public final class TestsHinglish extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("hi", "ZZ"); private static final Locale LOCALE = new Locale("hi", "ZZ");
private static final LayoutBase LAYOUT = new Qwerty(new HinglishCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Qwerty(new HinglishCustomizer(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;
@ -26,7 +26,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(LOCALE); private static final LayoutBase LAYOUT = new Myanmar(LOCALE);

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatin.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.SerbianQwertz; import com.android.inputmethod.keyboard.layout.SerbianQwertz;
@ -27,7 +27,7 @@ import java.util.Locale;
/** /**
* sr_ZZ: Serbian (Latin)/serbian_qwertz * sr_ZZ: Serbian (Latin)/serbian_qwertz
*/ */
@Suppress @SmallTest
public final class TestsSerbianLatin extends LayoutTestsBase { public final class TestsSerbianLatin extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("sr", "ZZ"); private static final Locale LOCALE = new Locale("sr", "ZZ");
private static final LayoutBase LAYOUT = new SerbianQwertz(new SerbianLatinCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new SerbianQwertz(new SerbianLatinCustomizer(LOCALE));

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.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.Qwerty; import com.android.inputmethod.keyboard.layout.Qwerty;
@ -29,7 +29,7 @@ import java.util.Locale;
/** /**
* sr_ZZ: Serbian (Latin)/qwerty * sr_ZZ: Serbian (Latin)/qwerty
*/ */
@Suppress @SmallTest
public final class TestsSerbianLatinQwerty extends LayoutTestsBase { public final class TestsSerbianLatinQwerty extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("sr", "ZZ"); private static final Locale LOCALE = new Locale("sr", "ZZ");
private static final LayoutBase LAYOUT = new Qwerty(new SerbianLatinQwertyCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Qwerty(new SerbianLatinQwertyCustomizer(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.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.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
*/ */
@Suppress @SmallTest
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));

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbek.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.Uzbek; import com.android.inputmethod.keyboard.layout.Uzbek;
@ -27,7 +27,7 @@ import java.util.Locale;
/** /**
* uz_UZ: Uzbek (Uzbekistan)/uzbek * uz_UZ: Uzbek (Uzbekistan)/uzbek
*/ */
@Suppress @SmallTest
public final class TestsUzbek extends LayoutTestsBase { public final class TestsUzbek extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("uz", "UZ"); private static final Locale LOCALE = new Locale("uz", "UZ");
private static final LayoutBase LAYOUT = new Uzbek(new UzbekCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Uzbek(new UzbekCustomizer(LOCALE));

4
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.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.Qwerty; import com.android.inputmethod.keyboard.layout.Qwerty;
@ -28,7 +28,7 @@ import java.util.Locale;
/** /**
* uz_UZ: Uzbek (Uzbekistan)/qwerty * uz_UZ: Uzbek (Uzbekistan)/qwerty
*/ */
@Suppress @SmallTest
public final class TestsUzbekQwerty extends LayoutTestsBase { public final class TestsUzbekQwerty extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("uz", "UZ"); private static final Locale LOCALE = new Locale("uz", "UZ");
private static final LayoutBase LAYOUT = new Qwerty(new UzbekQwertyCustomizer(LOCALE)); private static final LayoutBase LAYOUT = new Qwerty(new UzbekQwertyCustomizer(LOCALE));