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

Merge commit '47ad0cf3' into manualmerge

Browse Source 
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
This commit is contained in:
Ken Wakasa
2010-09-30 11:39:09 +09:00
parent 3b6aa41cce 47ad0cf3bc
commit 6d5b8951b1
23 changed files with 23 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,8 @@ public class LanguageSettings extends SettingsPreferenceFragment {
private static final String KEY_PHONE_LANGUAGE = "phone_language";
private static final String KEY_INPUT_METHOD = "input_method";
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 +71,7 @@ public class LanguageSettings extends SettingsPreferenceFragment {
if (getActivity().getAssets().getLocales().length == 1) {
getPreferenceScreen().
removePreference(findPreference("language_category"));
removePreference(findPreference(KEY_PHONE_LANGUAGE));
} else {
mLanguagePref = findPreference(KEY_PHONE_LANGUAGE);
}
@@ -78,7 +79,7 @@ public class LanguageSettings extends SettingsPreferenceFragment {
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 +100,8 @@ public class LanguageSettings extends SettingsPreferenceFragment {
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 +117,7 @@ public class LanguageSettings extends SettingsPreferenceFragment {
CheckBoxPreference chkbxPref = new CheckBoxPreference(getActivity());
chkbxPref.setKey(prefKey);
chkbxPref.setTitle(label);
textCategory.addPreference(chkbxPref);
keyboardSettingsCategory.addPreference(chkbxPref);
mCheckboxes.add(chkbxPref);
}
@@ -136,7 +138,7 @@ public class LanguageSettings extends SettingsPreferenceFragment {
R.string.input_methods_settings_label_format, label);
prefScreen.setSummary(settingsLabel);
}
textCategory.addPreference(prefScreen);
keyboardSettingsCategory.addPreference(prefScreen);
}
}
}