am 0722e6b3: Small cleanup for test code

* commit '0722e6b3df9904d07d74091122e422395810dfb3':
  Small cleanup for test code
main
Tadashi G. Takaoka 2014-03-11 01:37:40 -07:00 committed by Android Git Automerger
commit 8e4a18f7f2
2 changed files with 4 additions and 7 deletions

View File

@ -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.

View File

@ -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.