diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-12-15 10:08:22 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-12-15 10:08:22 -0800 |
| commit | b0980f0d9029671e300a4bcfee50a0694b519368 (patch) | |
| tree | 5d337d5c8dd0b791ce8084f2a98db86a1b926b4e /java/src/com/android/inputmethod/deprecated | |
| parent | d86696a110130b0f5d8f3007da02ae68b91f76f7 (diff) | |
| parent | 689b90115633146bcdea81bf89cdfe2f9a88c0a7 (diff) | |
| download | latinime-b0980f0d9029671e300a4bcfee50a0694b519368.tar.gz latinime-b0980f0d9029671e300a4bcfee50a0694b519368.tar.xz latinime-b0980f0d9029671e300a4bcfee50a0694b519368.zip | |
am 689b9011: Merge "Utilize KeyboardSet XML definitions"
* commit '689b90115633146bcdea81bf89cdfe2f9a88c0a7':
Utilize KeyboardSet XML definitions
Diffstat (limited to 'java/src/com/android/inputmethod/deprecated')
| -rw-r--r-- | java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java b/java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java index dbe7aec6a..e75e14861 100644 --- a/java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java +++ b/java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java @@ -17,7 +17,7 @@ package com.android.inputmethod.deprecated.languageswitcher; import com.android.inputmethod.compat.SharedPreferencesCompat; -import com.android.inputmethod.keyboard.internal.KeyboardBuilder; +import com.android.inputmethod.keyboard.KeyboardSet; import com.android.inputmethod.latin.DictionaryFactory; import com.android.inputmethod.latin.LocaleUtils; import com.android.inputmethod.latin.R; @@ -162,8 +162,8 @@ public class InputLanguageSelection extends PreferenceActivity { try { final String localeStr = locale.toString(); - final String[] layoutCountryCodes = KeyboardBuilder.parseKeyboardLocale( - this, R.xml.kbd_qwerty).split(",", -1); + final String[] layoutCountryCodes = KeyboardSet.parseKeyboardLocale( + getResources(), R.xml.keyboard_set).split(",", -1); if (!TextUtils.isEmpty(localeStr) && layoutCountryCodes.length > 0) { for (String s : layoutCountryCodes) { if (s.equals(localeStr)) { |