am fd8b4522: (DO NOT MERGE) Remove preliminary keyboards from L

* commit 'fd8b4522df537dce75b8be87600fd8bdc64efb2b':
  (DO NOT MERGE) Remove preliminary keyboards from L
main
Tadashi G. Takaoka 2014-08-07 06:51:26 +00:00 committed by Android Git Automerger
commit 7b238b4549
10 changed files with 34 additions and 18 deletions

View File

@ -178,6 +178,7 @@
/>
<!-- TODO: This bengali 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="0xbff5986c"
@ -186,6 +187,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali,EmojiCapable"
android:isAsciiCapable="false"
/>
-->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0xd2e520d5"
@ -446,6 +448,7 @@
/>
<!-- TODO: This kannada 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="0x8c78064f"
@ -454,6 +457,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=kannada,EmojiCapable"
android:isAsciiCapable="false"
/>
-->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x2e391c04"
@ -496,6 +500,7 @@
/>
<!-- TODO: This malayalam 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="0xc182ebd4"
@ -504,6 +509,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=malayalam,EmojiCapable"
android:isAsciiCapable="false"
/>
-->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0xcdcfc3ab"
@ -514,6 +520,7 @@
/>
<!-- TODO: This marathi 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="0x747b9f03"
@ -522,6 +529,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=marathi,EmojiCapable"
android:isAsciiCapable="false"
/>
-->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x84c87c61"
@ -532,6 +540,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"
@ -540,6 +549,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"
@ -622,6 +632,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"
@ -630,6 +641,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"
@ -690,6 +702,7 @@
/>
<!-- TODO: This tamil 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="0x67acea2a"
@ -698,8 +711,10 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
android:isAsciiCapable="false"
/>
-->
<!-- TODO: This telugu 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="0x1e177389"
@ -708,6 +723,7 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=telugu,EmojiCapable"
android:isAsciiCapable="false"
/>
-->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x1f94d5d4"

View File

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

View File

@ -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.Bengali;
import com.android.inputmethod.keyboard.layout.Bengali.BengaliCustomizer;
@ -29,7 +29,7 @@ import java.util.Locale;
/**
* bn_IN: Bengali (India)/bengali
*/
@SmallTest
@Suppress
public final class TestsBengaliIN extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("bn", "IN");
private static final LayoutBase LAYOUT = new Bengali(new BengaliINCustomzier(LOCALE));

View File

@ -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.Kannada;
import com.android.inputmethod.keyboard.layout.Kannada.KannadaCustomizer;
@ -27,7 +27,7 @@ import java.util.Locale;
/**
* kn_IN: Kannada (India)/kannada
*/
@SmallTest
@Suppress
public final class TestsKannadaIN extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("kn", "IN");
private static final LayoutBase LAYOUT = new Kannada(new KannadaCustomizer(LOCALE));

View File

@ -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.Malayalam;
@ -25,9 +25,9 @@ import com.android.inputmethod.keyboard.layout.Malayalam.MalayalamCustomizer;
import java.util.Locale;
/**
* ta_IN: Malayalam (India)/malayalam
* ml_IN: Malayalam (India)/malayalam
*/
@SmallTest
@Suppress
public final class TestsMalayalamIN extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("ml", "IN");
private static final LayoutBase LAYOUT = new Malayalam(new MalayalamCustomizer(LOCALE));

View File

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

View File

@ -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;
@ -27,7 +27,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(new MyanmarCustomizer(LOCALE));

View File

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

View File

@ -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.Tamil;
@ -27,7 +27,7 @@ import java.util.Locale;
/**
* ta_IN: Tamil (India)/tamil
*/
@SmallTest
@Suppress
public final class TestsTamilIN extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("ta", "IN");
private static final LayoutBase LAYOUT = new Tamil(new TamilCustomizer(LOCALE));

View File

@ -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.Telugu;
@ -27,7 +27,7 @@ import java.util.Locale;
/**
* te_IN: Telugu (India)/telugu
*/
@SmallTest
@Suppress
public final class TestsTeluguIN extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("te", "IN");
private static final LayoutBase LAYOUT = new Telugu(new TeluguCustomizer(LOCALE));