diff options
Diffstat (limited to 'tests/src')
5 files changed, 25 insertions, 14 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java b/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java index 8b35e3f80..325b78450 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java @@ -24,8 +24,10 @@ import com.android.inputmethod.keyboard.layout.expected.LayoutBase; * The QWERTY alphabet keyboard. */ public final class Qwerty extends LayoutBase { + public static final String LAYOUT_NAME = "qwerty"; + public static ExpectedKey[][] getLayout(final boolean isPhone) { - return toCommonAlphabet(ALPHABET_COMMON, isPhone); + return getDefaultAlphabetLayout(ALPHABET_COMMON, isPhone); } private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder(10, 9, 7, 3) diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Symbols.java b/tests/src/com/android/inputmethod/keyboard/layout/Symbols.java index bf46d5d0d..6fcfa0520 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/Symbols.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/Symbols.java @@ -30,14 +30,13 @@ public final class Symbols extends LayoutBase { } public static ExpectedKey[][] getDefaultLayout(final boolean isPhone) { - final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder(SYMBOLS_COMMON); + final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder(getLayout(isPhone)); builder.replaceKeyOfLabel(CURRENCY, Symbols.CURRENCY_DOLLAR); builder.replaceKeyOfLabel(DOUBLE_QUOTE, key("\"", join(Symbols.DOUBLE_QUOTES_9LR, Symbols.DOUBLE_ANGLE_QUOTES_LR))); builder.replaceKeyOfLabel(SINGLE_QUOTE, key("'", join(Symbols.SINGLE_QUOTES_9LR, Symbols.SINGLE_ANGLE_QUOTES_LR))); - final ExpectedKey[][] symbolsCommon = builder.build(); - return isPhone ? toPhoneSymbol(symbolsCommon) : toTabletSymbols(symbolsCommon); + return builder.build(); } // Functional keys. diff --git a/tests/src/com/android/inputmethod/keyboard/layout/SymbolsShifted.java b/tests/src/com/android/inputmethod/keyboard/layout/SymbolsShifted.java index d04ebf021..4d9ae4348 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/SymbolsShifted.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/SymbolsShifted.java @@ -31,11 +31,9 @@ public final class SymbolsShifted extends LayoutBase { } public static ExpectedKey[][] getDefaultLayout(final boolean isPhone) { - final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder(SYMBOLS_SHIFTED_COMMON); + final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder(getLayout(isPhone)); builder.replaceKeyOfLabel(OTHER_CURRENCIES, SymbolsShifted.CURRENCIES_OTHER_THAN_DOLLAR); - final ExpectedKey[][] symbolsShiftedCommon = builder.build(); - return isPhone ? toPhoneSymbolsShifted(symbolsShiftedCommon) - : toTabletSymbolsShifted(symbolsShiftedCommon); + return builder.build(); } // Functional key. diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/LayoutBase.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/LayoutBase.java index 329f70471..813a51f74 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/expected/LayoutBase.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/LayoutBase.java @@ -121,9 +121,10 @@ public class LayoutBase { "&", "%", "+", "\"", "-", ":", "@" }; + // Helper method to create alphabet layout for phone by adding special function keys except + // shift key. private static ExpectedKeyboardBuilder toPhoneAlphabet(final ExpectedKeyboardBuilder builder) { return builder - .addKeysOnTheLeftOfRow(3, key(SHIFT_KEY, CAPSLOCK_MORE_KEY)) .addKeysOnTheRightOfRow(3, DELETE_KEY) .setLabelsOfRow(4, ",", " ", ".") .setMoreKeysOf(",", SETTINGS_KEY) @@ -134,8 +135,7 @@ public class LayoutBase { // Helper method to create alphabet layout for tablet by adding special function keys except // shift key. - public static ExpectedKeyboardBuilder toTabletAlphabetWithoutShiftKeys( - final ExpectedKeyboardBuilder builder) { + private static ExpectedKeyboardBuilder toTabletAlphabet(final ExpectedKeyboardBuilder builder) { return builder // U+00BF: "¿" INVERTED QUESTION MARK // U+00A1: "¡" INVERTED EXCLAMATION MARK @@ -150,13 +150,25 @@ public class LayoutBase { } // Helper method to create alphabet layout by adding special function keys. - public static ExpectedKey[][] toCommonAlphabet(final ExpectedKey[][] common, + public static ExpectedKey[][] getAlphabetLayoutWithoutShiftKeys(final ExpectedKey[][] common, final boolean isPhone) { final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder(common); if (isPhone) { toPhoneAlphabet(builder); } else { - toTabletAlphabetWithoutShiftKeys(builder); + toTabletAlphabet(builder).build(); + } + return builder.build(); + } + + // Helper method to create alphabet layout by adding special function keys. + public static ExpectedKey[][] getDefaultAlphabetLayout(final ExpectedKey[][] common, + final boolean isPhone) { + final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder( + getAlphabetLayoutWithoutShiftKeys(common, isPhone)); + if (isPhone) { + builder.addKeysOnTheLeftOfRow(3, key(SHIFT_KEY, CAPSLOCK_MORE_KEY)); + } else { builder.addKeysOnTheLeftOfRow(3, key(SHIFT_KEY, CAPSLOCK_MORE_KEY)) .addKeysOnTheRightOfRow(3, key(SHIFT_KEY, CAPSLOCK_MORE_KEY)); } diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java index e160ae84f..fd1a60619 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java @@ -36,7 +36,7 @@ public final class TestsEnglishUS extends LayoutTestsBase { @Override String getTestKeyboardLayout() { - return "qwerty"; + return Qwerty.LAYOUT_NAME; } @Override |