diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-20 03:24:39 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-04-20 03:24:39 -0700 |
| commit | 118762b444f7cb0b72f92dbc9f98452adb5a5836 (patch) | |
| tree | b15a61e9891e6583ce60f795bfeb086271257901 /tests/src | |
| parent | a4b846ac73c4310980741a34671b00fd4efb48b6 (diff) | |
| parent | 38026b4f03fb4d846b8613d889d68c439f6e30cb (diff) | |
| download | latinime-118762b444f7cb0b72f92dbc9f98452adb5a5836.tar.gz latinime-118762b444f7cb0b72f92dbc9f98452adb5a5836.tar.xz latinime-118762b444f7cb0b72f92dbc9f98452adb5a5836.zip | |
Merge "Predefined keyboard layouts are configurable via XML resource"
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java index b29477057..16b544169 100644 --- a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java +++ b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java @@ -116,17 +116,17 @@ public class SubtypeLocaleTests extends AndroidTestCase { public void testSampleSubtypes() { final Context context = getContext(); final InputMethodSubtype EN_US = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.US.toString(), AdditionalSubtype.QWERTY); + context, Locale.US.toString(), "qwerty"); final InputMethodSubtype EN_GB = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.UK.toString(), AdditionalSubtype.QWERTY); + context, Locale.UK.toString(), "qwerty"); final InputMethodSubtype FR = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.FRENCH.toString(), AdditionalSubtype.AZERTY); + context, Locale.FRENCH.toString(), "azerty"); final InputMethodSubtype FR_CA = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.CANADA_FRENCH.toString(), AdditionalSubtype.QWERTY); + context, Locale.CANADA_FRENCH.toString(), "qwerty"); final InputMethodSubtype DE = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.GERMAN.toString(), AdditionalSubtype.QWERTZ); + context, Locale.GERMAN.toString(), "qwertz"); final InputMethodSubtype ZZ = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, SubtypeLocale.NO_LANGUAGE, AdditionalSubtype.QWERTY); + context, SubtypeLocale.NO_LANGUAGE, "qwerty"); assertFalse(AdditionalSubtype.isAdditionalSubtype(EN_US)); assertFalse(AdditionalSubtype.isAdditionalSubtype(EN_GB)); @@ -166,13 +166,13 @@ public class SubtypeLocaleTests extends AndroidTestCase { public void testAdditionalSubtype() { final InputMethodSubtype DE_QWERTY = AdditionalSubtype.createAdditionalSubtype( - Locale.GERMAN.toString(), AdditionalSubtype.QWERTY, null); + Locale.GERMAN.toString(), "qwerty", null); final InputMethodSubtype FR_QWERTZ = AdditionalSubtype.createAdditionalSubtype( - Locale.FRENCH.toString(), AdditionalSubtype.QWERTZ, null); + Locale.FRENCH.toString(), "qwertz", null); final InputMethodSubtype US_AZERTY = AdditionalSubtype.createAdditionalSubtype( - Locale.US.toString(), AdditionalSubtype.AZERTY, null); + Locale.US.toString(), "azerty", null); final InputMethodSubtype ZZ_AZERTY = AdditionalSubtype.createAdditionalSubtype( - SubtypeLocale.NO_LANGUAGE, AdditionalSubtype.AZERTY, null); + SubtypeLocale.NO_LANGUAGE, "azerty", null); assertTrue(AdditionalSubtype.isAdditionalSubtype(FR_QWERTZ)); assertTrue(AdditionalSubtype.isAdditionalSubtype(DE_QWERTY)); |