aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/Settings.java
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-05-17 17:34:17 +0900
committersatok <satok@google.com>2011-05-18 18:15:50 +0900
commiteaa10f44a4a0108a90803b1b28238842d3fb5add (patch)
treede5c0914608c56788eb709a1f67173f55250d43a /java/src/com/android/inputmethod/latin/Settings.java
parentd2d21ce0beeadfbcc477fcae32694846cb89dfe1 (diff)
downloadlatinime-eaa10f44a4a0108a90803b1b28238842d3fb5add.tar.gz
latinime-eaa10f44a4a0108a90803b1b28238842d3fb5add.tar.xz
latinime-eaa10f44a4a0108a90803b1b28238842d3fb5add.zip
Show full display names in the popup of the spacebar language swicher
- Multiply the speed of the slide Bug: 4427222 Change-Id: Ifd2de9843191296f0f311440ea7b8ab075c67d8d
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
-rw-r--r--java/src/com/android/inputmethod/latin/Settings.java5
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())]);