Merge "Refactor keyboard layout unit tests" (72ee0bdf) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+9 −11

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.inputmethod.keyboard.layout;

		import com.android.inputmethod.keyboard.layout.Symbols.RtlSymbols;
		import com.android.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
		import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
		import com.android.inputmethod.latin.Constants;
		@@ -27,17 +28,15 @@ import java.util.Locale;
		public final class Arabic extends LayoutBase {
		private static final String LAYOUT_NAME = "arabic";

		public Arabic(final LayoutCustomizer customizer) {
		super(customizer, ArabicSymbols.class, ArabicSymbolsShifted.class);
		public Arabic(final Locale locale) {
		super(new ArabicCustomizer(locale), ArabicSymbols.class, ArabicSymbolsShifted.class);
		}

		@Override
		public String getName() { return LAYOUT_NAME; }

		public static class ArabicCustomizer extends LayoutCustomizer {
		public ArabicCustomizer(final Locale locale) {
		super(locale);
		}
		private static class ArabicCustomizer extends LayoutCustomizer {
		ArabicCustomizer(final Locale locale) { super(locale); }

		@Override
		public ExpectedKey getAlphabetKey() { return ARABIC_ALPHABET_KEY; }
		@@ -141,13 +140,12 @@ public final class Arabic extends LayoutBase {
		ExpectedKey[][] getCommonAlphabetLayout(final boolean isPhone) {
		if (isPhone) {
		return ALPHABET_COMMON;
		} else {
		}
		final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder(ALPHABET_COMMON);
		// U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
		builder.insertKeysAtRow(3, 2, "\u0626");
		return builder.build();
		}
		}

		@Override
		ExpectedKey[][] getCommonAlphabetShiftLayout(final boolean isPhone, final int elementId) {

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.inputmethod.keyboard.layout;

		import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
		import com.android.inputmethod.latin.Constants;
		@@ -28,15 +29,16 @@ import java.util.Locale;
		public final class ArmenianPhonetic extends LayoutBase {
		private static final String LAYOUT_NAME = "armenian_phonetic";

		public ArmenianPhonetic(final LayoutCustomizer customizer) {
		super(customizer, ArmenianSymbols.class, ArmenianSymbolsShifted.class);
		public ArmenianPhonetic(final Locale locale) {
		super(new ArmenianPhoneticCustomizer(locale), ArmenianSymbols.class,
		ArmenianSymbolsShifted.class);
		}

		@Override
		public String getName() { return LAYOUT_NAME; }

		public static class ArmenianPhoneticCustomizer extends LayoutCustomizer {
		public ArmenianPhoneticCustomizer(final Locale locale) { super(locale); }
		private static class ArmenianPhoneticCustomizer extends LayoutCustomizer {
		ArmenianPhoneticCustomizer(final Locale locale) { super(locale); }

		@Override
		public int getNumberOfRows() { return 5; }

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.inputmethod.keyboard.layout;

		import com.android.inputmethod.keyboard.KeyboardId;
		import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.inputmethod.keyboard.layout;

		import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.inputmethod.keyboard.layout;

		import com.android.inputmethod.keyboard.KeyboardId;
		import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
		import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;