diff options
9 files changed, 22 insertions, 50 deletions
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 7013c6b86..4e2ce75f3 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -28,7 +28,7 @@ be_BY: Belarusian (Belarus)/east_slavic bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian_bds - (bn_IN: Bengali (India)/bengali) # This is a preliminary keyboard layout. + bn_IN: Bengali (India)/bengali ca: Catalan/spanish cs: Czech/qwertz da: Danish/nordic @@ -63,15 +63,15 @@ ka_GE: Georgian (Georgia)/georgian kk: Kazakh/east_slavic 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 lo_LA: Lao (Laos)/lao lt: Lithuanian/qwerty lv: Latvian/qwerty 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 - (mr_IN: Marathi (India)/marathi) # This is a preliminary keyboard layout. + mr_IN: Marathi (India)/marathi ms_MY: Malay (Malaysia)/qwerty (my_MM: Myanmar (Myanmar)/myanmar) # This is a preliminary keyboard layout. nb: Norwegian Bokmål/nordic @@ -84,15 +84,15 @@ pt_PT: Portuguese (Portugal)/qwerty ro: Romanian/qwerty 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 sl: Slovenian/qwerty sr: Serbian/south_slavic (sr-Latn: Serbian/qwerty) # not yet implemented. sv: Swedish/nordic sw: Swahili/qwerty - (ta_IN: Tamil (India)/tamil) # This is a preliminary keyboard layout. - (te_IN: Telugu (India)/telugu) # This is a preliminary keyboard layout. + ta_IN: Tamil (India)/tamil + te_IN: Telugu (India)/telugu th: Thai/thai tl: Tagalog/spanish tr: Turkish/qwerty @@ -176,9 +176,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds,EmojiCapable" 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" android:label="@string/subtype_generic" android:subtypeId="0xbff5986c" @@ -187,7 +184,6 @@ 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,9 +442,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=khmer,EmojiCapable" 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" android:label="@string/subtype_generic" android:subtypeId="0x8c78064f" @@ -457,7 +450,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=kannada,EmojiCapable" android:isAsciiCapable="false" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x2e391c04" @@ -498,9 +490,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic,EmojiCapable" 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" android:label="@string/subtype_generic" android:subtypeId="0xc182ebd4" @@ -509,7 +498,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=malayalam,EmojiCapable" android:isAsciiCapable="false" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0xcdcfc3ab" @@ -518,9 +506,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable" 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" android:label="@string/subtype_generic" android:subtypeId="0x747b9f03" @@ -529,7 +514,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=marathi,EmojiCapable" android:isAsciiCapable="false" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x84c87c61" @@ -630,9 +614,6 @@ android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" 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" android:label="@string/subtype_generic" android:subtypeId="0x5c6b3bde" @@ -641,7 +622,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable" android:isAsciiCapable="false" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x8e94d413" @@ -700,9 +680,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" 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" android:label="@string/subtype_generic" android:subtypeId="0x67acea2a" @@ -711,10 +688,6 @@ 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" @@ -723,7 +696,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=telugu,EmojiCapable" android:isAsciiCapable="false" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x1f94d5d4" diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java index e6f38e85f..6b0652c59 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java @@ -25,7 +25,7 @@ import java.util.ArrayList; @SmallTest 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_PREDEFINED_ADDITIONAL_SUBTYPES = 2; diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliIN.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliIN.java index 10ca3d80d..d64263207 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliIN.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliIN.java @@ -16,7 +16,7 @@ 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.BengaliCustomizer; @@ -29,7 +29,7 @@ import java.util.Locale; /** * bn_IN: Bengali (India)/bengali */ -@Suppress +@SmallTest 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)); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java index 70ff173cb..d1866e803 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java @@ -16,7 +16,7 @@ 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.KannadaCustomizer; @@ -27,7 +27,7 @@ import java.util.Locale; /** * kn_IN: Kannada (India)/kannada */ -@Suppress +@SmallTest 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)); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java index 60c9e900f..b494ad37b 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java @@ -16,7 +16,7 @@ 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.Malayalam; @@ -27,7 +27,7 @@ import java.util.Locale; /** * ml_IN: Malayalam (India)/malayalam */ -@Suppress +@SmallTest 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)); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java index d45d99d10..b937629b0 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java @@ -16,7 +16,7 @@ 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.Marathi; @@ -27,7 +27,7 @@ import java.util.Locale; /** * mr_IN: Marathi (India)/marathi */ -@Suppress +@SmallTest 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)); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java index 8b861359b..1cea49760 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java @@ -16,7 +16,7 @@ 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.Sinhala; @@ -27,7 +27,7 @@ import java.util.Locale; /** * si_LK: Sinhala (Sri Lanka)/sinhala */ -@Suppress +@SmallTest 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)); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilIN.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilIN.java index 23d8778ed..5b3649d2b 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilIN.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilIN.java @@ -16,7 +16,7 @@ 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.Tamil; @@ -27,7 +27,7 @@ import java.util.Locale; /** * ta_IN: Tamil (India)/tamil */ -@Suppress +@SmallTest 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)); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTeluguIN.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTeluguIN.java index 82046a59d..04996d9aa 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTeluguIN.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTeluguIN.java @@ -16,7 +16,7 @@ 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.Telugu; @@ -27,7 +27,7 @@ import java.util.Locale; /** * te_IN: Telugu (India)/telugu */ -@Suppress +@SmallTest 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)); |