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

Merge "Update settings wording for ICS"

Browse Source
This commit is contained in:
Jean Chalard
2011-09-01 04:40:13 -07:00
committed by Android (Google) Code Review
parent 9a4543e1de 8ba5c42b21
commit dbb3afd7ed
4 changed files with 34 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/VoiceInputOutputSettings.java
View File

@@ -51,12 +51,12 @@ public class VoiceInputOutputSettings implements OnPreferenceChangeListener {
private static final String TAG = "VoiceInputOutputSettings";
private static final String KEY_VOICE_INPUT_CATEGORY = "voice_input_category";
private static final String KEY_VOICE_CATEGORY = "voice_category";
private static final String KEY_RECOGNIZER = "recognizer";
private static final String KEY_RECOGNIZER_SETTINGS = "recognizer_settings";
private PreferenceGroup mParent;
private PreferenceCategory mVoiceInputCategory;
private PreferenceCategory mVoiceCategory;
private ListPreference mRecognizerPref;
private PreferenceScreen mSettingsPref;
private SettingsPreferenceFragment mFragment;
@@ -70,11 +70,11 @@ public class VoiceInputOutputSettings implements OnPreferenceChangeListener {
public void onCreate() {
mParent = (PreferenceGroup) mFragment.getPreferenceScreen();
mVoiceInputCategory = (PreferenceCategory) mParent.findPreference(KEY_VOICE_INPUT_CATEGORY);
mRecognizerPref = (ListPreference) mVoiceInputCategory.findPreference(KEY_RECOGNIZER);
mVoiceCategory = (PreferenceCategory) mParent.findPreference(KEY_VOICE_CATEGORY);
mRecognizerPref = (ListPreference) mVoiceCategory.findPreference(KEY_RECOGNIZER);
mRecognizerPref.setOnPreferenceChangeListener(this);
mSettingsPref = (PreferenceScreen)
mVoiceInputCategory.findPreference(KEY_RECOGNIZER_SETTINGS);
mVoiceCategory.findPreference(KEY_RECOGNIZER_SETTINGS);
mAvailableRecognizersMap = new HashMap<String, ResolveInfo>();
@@ -89,11 +89,11 @@ public class VoiceInputOutputSettings implements OnPreferenceChangeListener {
if (numAvailable == 0) {
// No recognizer available - remove all related preferences.
mFragment.getPreferenceScreen().removePreference(mVoiceInputCategory);
mFragment.getPreferenceScreen().removePreference(mVoiceCategory);
} else if (numAvailable == 1) {
// Only one recognizer available, so don't show the list of choices, but do
// set up the link to settings for the available recognizer.
mVoiceInputCategory.removePreference(mRecognizerPref);
mVoiceCategory.removePreference(mRecognizerPref);
// But first set up the available recognizers map with just the one recognizer.
ResolveInfo resolveInfo = availableRecognitionServices.get(0);
@@ -193,7 +193,7 @@ public class VoiceInputOutputSettings implements OnPreferenceChangeListener {
// No settings preference available - hide the preference.
Log.w(TAG, "no recognizer settings available for " + si.packageName);
mSettingsPref.setIntent(null);
mVoiceInputCategory.removePreference(mSettingsPref);
mVoiceCategory.removePreference(mSettingsPref);
} else {
Intent i = new Intent(Intent.ACTION_MAIN);
i.setComponent(new ComponentName(si.packageName, settingsActivity));

3
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

@@ -139,8 +139,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
if (null == localeList) {
// The locale list is null if and only if the user dictionary service is
// not present or disabled. In this case we need to remove the preference.
((PreferenceGroup)findPreference("language_settings_category")).removePreference(
userDictionaryPreference);
getPreferenceScreen().removePreference(userDictionaryPreference);
} else if (localeList.size() <= 1) {
userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
userDictionaryPreference.setFragment(UserDictionarySettings.class.getName());