am 015fcc26: (DO NOT MERGE) Enable InScript keyboards for L

* commit '015fcc268547c663f89e3ae1afddfe1088b2f440':
  (DO NOT MERGE) Enable InScript keyboards for L
This commit is contained in:
Tadashi G. Takaoka 2014-08-11 07:06:22 +00:00 committed by Android Git Automerger
commit edfbde2751
9 changed files with 22 additions and 50 deletions

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_IN: Bengali (India)/bengali) # This is a preliminary keyboard layout. bn_IN: Bengali (India)/bengali
ca: Catalan/spanish ca: Catalan/spanish
cs: Czech/qwertz cs: Czech/qwertz
da: Danish/nordic da: Danish/nordic
@ -63,15 +63,15 @@
ka_GE: Georgian (Georgia)/georgian ka_GE: Georgian (Georgia)/georgian
kk: Kazakh/east_slavic kk: Kazakh/east_slavic
km_KH: Khmer (Cambodia)/khmer km_KH: Khmer (Cambodia)/khmer
(kn_IN: Kannada (India)/kannada) # This is a preliminary keyboard layout. kn_IN: Kannada (India)/kannada
ky: Kyrgyz/east_slavic ky: Kyrgyz/east_slavic
lo_LA: Lao (Laos)/lao lo_LA: Lao (Laos)/lao
lt: Lithuanian/qwerty lt: Lithuanian/qwerty
lv: Latvian/qwerty lv: Latvian/qwerty
mk: Macedonian/south_slavic mk: Macedonian/south_slavic
(ml_IN: Malayalam (India)/malayalam) # This is a preliminary keyboard layout. ml_IN: Malayalam (India)/malayalam
mn_MN: Mongolian (Mongolia)/mongolian mn_MN: Mongolian (Mongolia)/mongolian
(mr_IN: Marathi (India)/marathi) # This is a preliminary keyboard layout. 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
@ -84,15 +84,15 @@
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
sk: Slovak/qwerty sk: Slovak/qwerty
sl: Slovenian/qwerty sl: Slovenian/qwerty
sr: Serbian/south_slavic sr: Serbian/south_slavic
(sr-Latn: Serbian/qwerty) # not yet implemented. (sr-Latn: Serbian/qwerty) # not yet implemented.
sv: Swedish/nordic sv: Swedish/nordic
sw: Swahili/qwerty sw: Swahili/qwerty
(ta_IN: Tamil (India)/tamil) # This is a preliminary keyboard layout. ta_IN: Tamil (India)/tamil
(te_IN: Telugu (India)/telugu) # This is a preliminary keyboard layout. te_IN: Telugu (India)/telugu
th: Thai/thai th: Thai/thai
tl: Tagalog/spanish tl: Tagalog/spanish
tr: Turkish/qwerty tr: Turkish/qwerty
@ -176,9 +176,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<!-- TODO: This bengali 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="0xbff5986c" android:subtypeId="0xbff5986c"
@ -187,7 +184,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali,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="0xd2e520d5" android:subtypeId="0xd2e520d5"
@ -446,9 +442,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=khmer,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=khmer,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<!-- TODO: This kannada 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="0x8c78064f" android:subtypeId="0x8c78064f"
@ -457,7 +450,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=kannada,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=kannada,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="0x2e391c04" android:subtypeId="0x2e391c04"
@ -498,9 +490,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<!-- TODO: This malayalam 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="0xc182ebd4" android:subtypeId="0xc182ebd4"
@ -509,7 +498,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=malayalam,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=malayalam,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="0xcdcfc3ab" android:subtypeId="0xcdcfc3ab"
@ -518,9 +506,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable"
android:isAsciiCapable="false" android:isAsciiCapable="false"
/> />
<!-- TODO: This marathi 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="0x747b9f03" android:subtypeId="0x747b9f03"
@ -529,7 +514,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"
@ -630,9 +614,6 @@
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"
@ -641,7 +622,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"
@ -700,9 +680,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
android:isAsciiCapable="true" android:isAsciiCapable="true"
/> />
<!-- TODO: This tamil 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="0x67acea2a" android:subtypeId="0x67acea2a"
@ -711,10 +688,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
android:isAsciiCapable="false" 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" <subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x1e177389" android:subtypeId="0x1e177389"
@ -723,7 +696,6 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=telugu,EmojiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=telugu,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="0x1f94d5d4" android:subtypeId="0x1f94d5d4"

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 = 69; private static final int NUMBER_OF_SUBTYPES = 76;
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;

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

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

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

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));

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

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

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