PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d2c3f37f: Revise the Language & keyboard settings layout.

Browse Source 
Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp

* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
  Revise the Language & keyboard settings layout.
This commit is contained in:
Ken Wakasa
2010-09-29 09:58:01 -07:00
committed by Android Git Automerger
parent 1ff9ad3fb4 d2c3f37fa4
commit 47ad0cf3bc
23 changed files with 25 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/LanguageSettings.java
View File

@@ -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;
@@ -70,7 +72,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);
}
@@ -78,7 +80,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;
}
@@ -99,7 +101,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());
@@ -115,7 +118,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);
}
@@ -135,7 +138,7 @@ public class LanguageSettings extends PreferenceActivity {
R.string.input_methods_settings_label_format, label);
prefScreen.setSummary(settingsLabel);
}
textCategory.addPreference(prefScreen);
keyboardSettingsCategory.addPreference(prefScreen);
}
}
}