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

Merge "Fix bug 3421125 Use default TTS rate for demo in Settings"

Browse Source
This commit is contained in:
Jean-Michel Trivi
2011-03-02 16:08:44 -08:00
committed by Android (Google) Code Review
parent 6291d50b5d 8863ce9f4d
commit 9a777a8513
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/TextToSpeechSettings.java
View File

@@ -265,6 +265,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
} }
mDefaultRatePref.setValue(String.valueOf(mDefaultRate)); mDefaultRatePref.setValue(String.valueOf(mDefaultRate));
mDefaultRatePref.setOnPreferenceChangeListener(this); mDefaultRatePref.setOnPreferenceChangeListener(this);
// apply the default rate so the TTS demo in the Settings screen uses it, even if
// the use of default settings is not enforced
mTts.setSpeechRate(mDefaultRate/100.0f);
// Default language / country / variant : these three values map to a single ListPref // Default language / country / variant : these three values map to a single ListPref
// representing the matching Locale // representing the matching Locale
@@ -355,7 +358,6 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
mDefaultLocVariant = new String(); mDefaultLocVariant = new String();
} }
mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant)); mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
mTts.setSpeechRate(mDefaultRate/100.0f);
initDefaultSettings(); initDefaultSettings();
updateWidgetState(); updateWidgetState();
checkVoiceData(); checkVoiceData();