Small cleanup for test code

Change-Id: I5106c8c52bdd11bfd23aa2e09f7ea53504083679

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.

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.