diff options
| author |   satok <satok@google.com> | 2011-05-18 02:34:37 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-05-18 02:34:37 -0700 |
| commit | 0b47f3af83648293afb836250756cc14dffcde4b (patch) | |
| tree | d5e8eaac628c435d36f23da5a8df14ce327bc479 /java/src/com/android/inputmethod/latin/Settings.java | |
| parent | a205d23ffdec7e89933c5052ddf325af344f4af0 (diff) | |
| parent | eaa10f44a4a0108a90803b1b28238842d3fb5add (diff) | |
| download | latinime-0b47f3af83648293afb836250756cc14dffcde4b.tar.gz latinime-0b47f3af83648293afb836250756cc14dffcde4b.tar.xz latinime-0b47f3af83648293afb836250756cc14dffcde4b.zip | |
Merge "Show full display names in the popup of the spacebar language swicher"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 7c323c155..d64410a3d 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -121,7 +121,7 @@ public class Settings extends PreferenceActivity final Resources res = context.getResources(); final Locale savedLocale; if (null != localeStr) { - final Locale keyboardLocale = new Locale(localeStr); + final Locale keyboardLocale = Utils.constructLocaleFromString(localeStr); savedLocale = Utils.setSystemLocale(res, keyboardLocale); } else { savedLocale = null; @@ -354,8 +354,6 @@ public class Settings extends PreferenceActivity (PreferenceGroup) findPreference(PREF_GENERAL_SETTINGS_KEY); final PreferenceGroup textCorrectionGroup = (PreferenceGroup) findPreference(PREF_CORRECTION_SETTINGS_KEY); - final PreferenceGroup bigramGroup = - (PreferenceGroup) findPreference(PREF_NGRAM_SETTINGS_KEY); final boolean showSettingsKeyOption = res.getBoolean( R.bool.config_enable_show_settings_key_option); @@ -499,7 +497,6 @@ public class Settings extends PreferenceActivity } private void updateSettingsKeySummary() { - final ListPreference lp = mSettingsKeyPreference; mSettingsKeyPreference.setSummary( getResources().getStringArray(R.array.settings_key_modes) [mSettingsKeyPreference.findIndexOfValue(mSettingsKeyPreference.getValue())]); |