Merge "Remove preliminary subtypes from E-MR1 release"
This commit is contained in:
commit
3215338fa0
9 changed files with 30 additions and 16 deletions
|
@ -183,6 +183,7 @@
|
|||
/>
|
||||
<!-- TODO: This Bengali (Bangladesh) 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="0xa2144b0c"
|
||||
|
@ -191,6 +192,7 @@
|
|||
android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_akkhor,EmojiCapable"
|
||||
android:isAsciiCapable="false"
|
||||
/>
|
||||
-->
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0xbff5986c"
|
||||
|
@ -369,6 +371,7 @@
|
|||
/>
|
||||
<!-- TODO: This Hinglish 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_hi_ZZ"
|
||||
android:subtypeId="0x352eb37c"
|
||||
|
@ -377,6 +380,7 @@
|
|||
android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable"
|
||||
android:isAsciiCapable="true"
|
||||
/>
|
||||
-->
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x35b7526a"
|
||||
|
@ -549,6 +553,7 @@
|
|||
/>
|
||||
<!-- TODO: This Myanmar 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="0xea266ea4"
|
||||
|
@ -557,6 +562,7 @@
|
|||
android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable,CombiningRules=MyanmarReordering"
|
||||
android:isAsciiCapable="false"
|
||||
/>
|
||||
-->
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x3f12ee14"
|
||||
|
@ -639,6 +645,7 @@
|
|||
/>
|
||||
<!-- 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"
|
||||
|
@ -647,6 +654,7 @@
|
|||
android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable"
|
||||
android:isAsciiCapable="false"
|
||||
/>
|
||||
-->
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x8e94d413"
|
||||
|
@ -673,6 +681,7 @@
|
|||
/>
|
||||
<!-- TODO: This Serbian Latin 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_sr_ZZ"
|
||||
android:subtypeId="0xf4a5569c"
|
||||
|
@ -681,6 +690,7 @@
|
|||
android:imeSubtypeExtraValue="KeyboardLayoutSet=serbian_qwertz,AsciiCapable,EmojiCapable"
|
||||
android:isAsciiCapable="true"
|
||||
/>
|
||||
-->
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x48b4ff43"
|
||||
|
@ -706,6 +716,7 @@
|
|||
android:isAsciiCapable="false"
|
||||
/>
|
||||
<!-- 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"
|
||||
|
@ -714,6 +725,7 @@
|
|||
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
|
||||
android:isAsciiCapable="false"
|
||||
/>
|
||||
-->
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x785abbd9"
|
||||
|
@ -764,6 +776,7 @@
|
|||
/>
|
||||
<!-- TODO: This Uzbek 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="0xad5cf7f6"
|
||||
|
@ -772,6 +785,7 @@
|
|||
android:imeSubtypeExtraValue="KeyboardLayoutSet=uzbek,AsciiCapable,EmojiCapable"
|
||||
android:isAsciiCapable="true"
|
||||
/>
|
||||
-->
|
||||
<subtype android:icon="@drawable/ic_ime_switcher_dark"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="0x93972eee"
|
||||
|
|
|
@ -27,8 +27,8 @@ import java.util.ArrayList;
|
|||
|
||||
@SmallTest
|
||||
public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {
|
||||
private static final int NUMBER_OF_SUBTYPES = 85;
|
||||
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50;
|
||||
private static final int NUMBER_OF_SUBTYPES = 78;
|
||||
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 47;
|
||||
private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;
|
||||
|
||||
@Override
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
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.BengaliAkkhor;
|
||||
import com.android.inputmethod.keyboard.layout.LayoutBase;
|
||||
|
@ -29,7 +29,7 @@ import java.util.Locale;
|
|||
/**
|
||||
* bn_BD: Bengali (Bangladesh)/bengali_akkhor
|
||||
*/
|
||||
@SmallTest
|
||||
@Suppress
|
||||
public final class TestsBengaliBD extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("bn", "BD");
|
||||
private static final LayoutBase LAYOUT = new BengaliAkkhor(new BengaliBDCustomzier(LOCALE));
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
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.Qwerty;
|
||||
|
@ -30,7 +30,7 @@ import java.util.Locale;
|
|||
/*
|
||||
* hi_ZZ: Hinglish/qwerty
|
||||
*/
|
||||
@SmallTest
|
||||
@Suppress
|
||||
public final class TestsHinglish extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("hi", "ZZ");
|
||||
private static final LayoutBase LAYOUT = new Qwerty(new HinglishCustomizer(LOCALE));
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
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.Myanmar;
|
||||
|
@ -26,7 +26,7 @@ import java.util.Locale;
|
|||
/**
|
||||
* my_MM: Myanmar (Myanmar)/myanmar
|
||||
*/
|
||||
@SmallTest
|
||||
@Suppress
|
||||
public final class TestsMyanmarMM extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("my", "MM");
|
||||
private static final LayoutBase LAYOUT = new Myanmar(LOCALE);
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
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.SerbianQwertz;
|
||||
|
@ -27,7 +27,7 @@ import java.util.Locale;
|
|||
/**
|
||||
* sr_ZZ: Serbian (Latin)/serbian_qwertz
|
||||
*/
|
||||
@SmallTest
|
||||
@Suppress
|
||||
public final class TestsSerbianLatin extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("sr", "ZZ");
|
||||
private static final LayoutBase LAYOUT = new SerbianQwertz(new SerbianLatinCustomizer(LOCALE));
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
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.Qwerty;
|
||||
|
@ -29,7 +29,7 @@ import java.util.Locale;
|
|||
/**
|
||||
* sr_ZZ: Serbian (Latin)/qwerty
|
||||
*/
|
||||
@SmallTest
|
||||
@Suppress
|
||||
public final class TestsSerbianLatinQwerty extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("sr", "ZZ");
|
||||
private static final LayoutBase LAYOUT = new Qwerty(new SerbianLatinQwertyCustomizer(LOCALE));
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
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.Uzbek;
|
||||
|
@ -27,7 +27,7 @@ import java.util.Locale;
|
|||
/**
|
||||
* uz_UZ: Uzbek (Uzbekistan)/uzbek
|
||||
*/
|
||||
@SmallTest
|
||||
@Suppress
|
||||
public final class TestsUzbek extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("uz", "UZ");
|
||||
private static final LayoutBase LAYOUT = new Uzbek(new UzbekCustomizer(LOCALE));
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
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.Qwerty;
|
||||
|
@ -28,7 +28,7 @@ import java.util.Locale;
|
|||
/**
|
||||
* uz_UZ: Uzbek (Uzbekistan)/qwerty
|
||||
*/
|
||||
@SmallTest
|
||||
@Suppress
|
||||
public final class TestsUzbekQwerty extends LayoutTestsBase {
|
||||
private static final Locale LOCALE = new Locale("uz", "UZ");
|
||||
private static final LayoutBase LAYOUT = new Qwerty(new UzbekQwertyCustomizer(LOCALE));
|
||||
|
|
Loading…
Reference in a new issue