Merge "Remove preliminary subtypes from E-MR1 release" (96d97ee2) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml/method.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -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"

tests/src/com/android/inputmethod/keyboard/action/KlpActionLabelTests.java

+21 −13

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ public class KlpActionLabelTests extends KlpActionTestsBase {
		textsSet.getText("label_done_key"));
		final ExpectedActionKey previousKey = ExpectedActionKey.newLabelKey(
		textsSet.getText("label_previous_key"));
		final String tag = "label=hi_ZZ system=" + systemLocale
		final String tag = "label=" + subtype.getLocale() + " system=" + systemLocale
		+ " " + SubtypeLocaleUtils.getSubtypeNameForLogging(subtype);
		final RunInLocale<Void> job = new RunInLocale<Void>() {
		@Override
		@@ -147,26 +147,34 @@ public class KlpActionLabelTests extends KlpActionTestsBase {
		public void testHinglishActionLabel() {
		final RichInputMethodManager richImm = RichInputMethodManager.getInstance();
		final Locale hi_ZZ = new Locale("hi", "ZZ");
		final InputMethodSubtype hinglish = richImm.findSubtypeByLocaleAndKeyboardLayoutSet(
		final InputMethodSubtype hiLatn = richImm.findSubtypeByLocaleAndKeyboardLayoutSet(
		hi_ZZ.toString(), SubtypeLocaleUtils.QWERTY);
		// This is a preliminary subtype and may not exist.
		if (hiLatn == null) {
		return;
		}
		// An action label should be displayed in subtype's locale regardless of the system locale.
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, hi_ZZ, hi_ZZ);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, hi_ZZ, Locale.US);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, hi_ZZ, Locale.FRENCH);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, hi_ZZ, Locale.ITALIAN);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, hi_ZZ, Locale.JAPANESE);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hiLatn, hi_ZZ, new Locale("hi"));
		doTestActionKeysInLocaleWithKeyboardTextsSet(hiLatn, hi_ZZ, Locale.US);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hiLatn, hi_ZZ, Locale.FRENCH);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hiLatn, hi_ZZ, Locale.ITALIAN);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hiLatn, hi_ZZ, Locale.JAPANESE);
		}

		public void testSerbianLatinActionLabel() {
		final RichInputMethodManager richImm = RichInputMethodManager.getInstance();
		final Locale sr_ZZ = new Locale("sr", "ZZ");
		final InputMethodSubtype hinglish = richImm.findSubtypeByLocaleAndKeyboardLayoutSet(
		final InputMethodSubtype srLatn = richImm.findSubtypeByLocaleAndKeyboardLayoutSet(
		sr_ZZ.toString(), "serbian_qwertz");
		// This is a preliminary subtype and may not exist.
		if (srLatn == null) {
		return;
		}
		// An action label should be displayed in subtype's locale regardless of the system locale.
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, sr_ZZ, sr_ZZ);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, sr_ZZ, Locale.US);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, sr_ZZ, Locale.FRENCH);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, sr_ZZ, Locale.ITALIAN);
		doTestActionKeysInLocaleWithKeyboardTextsSet(hinglish, sr_ZZ, Locale.JAPANESE);
		doTestActionKeysInLocaleWithKeyboardTextsSet(srLatn, sr_ZZ, new Locale("sr"));
		doTestActionKeysInLocaleWithKeyboardTextsSet(srLatn, sr_ZZ, Locale.US);
		doTestActionKeysInLocaleWithKeyboardTextsSet(srLatn, sr_ZZ, Locale.FRENCH);
		doTestActionKeysInLocaleWithKeyboardTextsSet(srLatn, sr_ZZ, Locale.ITALIAN);
		doTestActionKeysInLocaleWithKeyboardTextsSet(srLatn, sr_ZZ, Locale.JAPANESE);
		}
		}

tests/src/com/android/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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));

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHinglish.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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));