diff options
| author | Ken Wakasa <kwakasa@google.com> | 2010-09-28 19:01:17 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2010-09-29 23:52:02 +0900 |
| commit | d2c3f37fa445130c8cce0f16347d61f66b4b0025 (patch) | |
| tree | b1df34e84746c448a4c6352c283fe4fd9ba32b74 /src/com | |
| parent | 48ad5dfe3189534cc3c9b8cb6f84758db19524c4 (diff) | |
| download | packages_apps_settings-d2c3f37fa445130c8cce0f16347d61f66b4b0025.zip packages_apps_settings-d2c3f37fa445130c8cce0f16347d61f66b4b0025.tar.gz packages_apps_settings-d2c3f37fa445130c8cce0f16347d61f66b4b0025.tar.bz2 | |
Revise the Language & keyboard settings layout.
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/LanguageSettings.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java index 91d260c..8ab8a0c 100644 --- a/src/com/android/settings/LanguageSettings.java +++ b/src/com/android/settings/LanguageSettings.java @@ -44,6 +44,8 @@ import java.util.List; public class LanguageSettings extends PreferenceActivity { private static final String KEY_PHONE_LANGUAGE = "phone_language"; + private static final String KEY_KEYBOARD_SETTINGS_CATEGORY = "keyboard_settings_category"; + private static final String KEY_HARDKEYBOARD_CATEGORY = "hardkeyboard_category"; private boolean mHaveHardKeyboard; private List<InputMethodInfo> mInputMethodProperties; @@ -68,7 +70,7 @@ public class LanguageSettings extends PreferenceActivity { if (getAssets().getLocales().length == 1) { getPreferenceScreen(). - removePreference(findPreference("language_category")); + removePreference(findPreference(KEY_PHONE_LANGUAGE)); } else { mLanguagePref = findPreference(KEY_PHONE_LANGUAGE); } @@ -76,7 +78,7 @@ public class LanguageSettings extends PreferenceActivity { Configuration config = getResources().getConfiguration(); if (config.keyboard != Configuration.KEYBOARD_QWERTY) { getPreferenceScreen().removePreference( - getPreferenceScreen().findPreference("hardkeyboard_category")); + getPreferenceScreen().findPreference(KEY_HARDKEYBOARD_CATEGORY)); } else { mHaveHardKeyboard = true; } @@ -97,7 +99,8 @@ public class LanguageSettings extends PreferenceActivity { mLastInputMethodId = Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD); - PreferenceGroup textCategory = (PreferenceGroup) findPreference("text_category"); + PreferenceGroup keyboardSettingsCategory = (PreferenceGroup) findPreference( + KEY_KEYBOARD_SETTINGS_CATEGORY); int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties .size()); @@ -113,7 +116,7 @@ public class LanguageSettings extends PreferenceActivity { CheckBoxPreference chkbxPref = new CheckBoxPreference(this); chkbxPref.setKey(prefKey); chkbxPref.setTitle(label); - textCategory.addPreference(chkbxPref); + keyboardSettingsCategory.addPreference(chkbxPref); mCheckboxes.add(chkbxPref); } @@ -133,7 +136,7 @@ public class LanguageSettings extends PreferenceActivity { R.string.input_methods_settings_label_format, label); prefScreen.setSummary(settingsLabel); } - textCategory.addPreference(prefScreen); + keyboardSettingsCategory.addPreference(prefScreen); } } } |