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

Make the one-recognizer case actually work. :) The settings item wasn't

Browse Source 
actually getting linked to the recognizer's settings in that case.

Also add a summary line to the line for choosing the recognizer, so you
can see which one is currently selected, in the case that more than one
is installed.

Fix the TTS settings strings to match what we do for voice input.
This commit is contained in:
Mike LeBeau
2010-02-12 14:47:48 -08:00
parent 766a19b278
commit 4c2ffc580c
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -2084,11 +2084,9 @@ found in the list of installed applications.</string>
<!-- Text-To-Speech (TTS) settings --><skip /> <!-- Text-To-Speech (TTS) settings --><skip />
<!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to the text-to-speech functionality --> <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
<string name="tts_settings">Text-to-speech</string> <string name="tts_settings">Text-to-speech settings</string>
<!-- Summary of setting on main settings screen. This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
<string name="tts_settings_summary">Set text-to-speech options</string>
<!-- Main TTS Settings screen title --> <!-- Main TTS Settings screen title -->
<string name="tts_settings_title">Text-to-speech</string> <string name="tts_settings_title">Text-to-speech settings</string>
<!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings --> <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
<string name="use_default_tts_settings_title">Always use my settings</string> <string name="use_default_tts_settings_title">Always use my settings</string>
<!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings --> <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->

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

@@ -92,8 +92,20 @@ public class VoiceInputOutputSettings extends PreferenceActivity
removePreference(mRecognizerPref); removePreference(mRecognizerPref);
removePreference(mSettingsPref); removePreference(mSettingsPref);
} else if (numAvailable == 1) { } else if (numAvailable == 1) {
// Only one recognizer available, so don't show the list of choices. // Only one recognizer available, so don't show the list of choices, but do
// set up the link to settings for the available recognizer.
removePreference(mRecognizerPref); removePreference(mRecognizerPref);
// But first set up the available recognizers map with just the one recognizer.
ResolveInfo resolveInfo = availableRecognitionServices.get(0);
String recognizerComponent =
new ComponentName(resolveInfo.serviceInfo.packageName,
resolveInfo.serviceInfo.name).flattenToString();
mAvailableRecognizersMap.put(recognizerComponent, resolveInfo);
String currentSetting = Settings.Secure.getString(
getContentResolver(), Settings.Secure.VOICE_RECOGNITION_SERVICE);
updateSettingsLink(currentSetting);
} else { } else {
// Multiple recognizers available, so show the full list of choices. // Multiple recognizers available, so show the full list of choices.
populateRecognizerPreference(availableRecognitionServices); populateRecognizerPreference(availableRecognitionServices);
@@ -186,6 +198,7 @@ public class VoiceInputOutputSettings extends PreferenceActivity
Intent i = new Intent(Intent.ACTION_MAIN); Intent i = new Intent(Intent.ACTION_MAIN);
i.setComponent(new ComponentName(si.packageName, settingsActivity)); i.setComponent(new ComponentName(si.packageName, settingsActivity));
mSettingsPref.setIntent(i); mSettingsPref.setIntent(i);
mRecognizerPref.setSummary(currentRecognizer.loadLabel(getPackageManager()));
} }
} }