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

Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev

Browse Source 
am: abef602

* commit 'abef602337c8d362021ebeaf081ff3ca8a2a61f8':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I3f870ed496e86180c3a14b490e6472007230e0e6
This commit is contained in:
shwetachahar
2016-04-18 15:04:53 +00:00
committed by android-build-merger
parent 39975a60cc abef602337
commit a4ae3073ab
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -252,15 +252,12 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
private void initSettings() { private void initSettings() {
final ContentResolver resolver = getContentResolver(); final ContentResolver resolver = getContentResolver();
// Set up the default rate and pitch. // Set up the default rate and pitch.
try { mDefaultRate = android.provider.Settings.Secure.getInt(
mDefaultPitch = android.provider.Settings.Secure.getInt(resolver, TTS_DEFAULT_PITCH); resolver, TTS_DEFAULT_RATE, TextToSpeech.Engine.DEFAULT_RATE);
mDefaultRate = android.provider.Settings.Secure.getInt(resolver, TTS_DEFAULT_RATE); mDefaultPitch = android.provider.Settings.Secure.getInt(
} catch (SettingNotFoundException e) { resolver, TTS_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH);
// Default rate and pitch setting not found, initialize it.
mDefaultPitch = TextToSpeech.Engine.DEFAULT_PITCH;
mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
}
mDefaultRatePref.setProgress(mDefaultRate); mDefaultRatePref.setProgress(mDefaultRate);
mDefaultRatePref.setOnPreferenceChangeListener(this); mDefaultRatePref.setOnPreferenceChangeListener(this);
mDefaultRatePref.setMax(MAX_SPEECH_RATE); mDefaultRatePref.setMax(MAX_SPEECH_RATE);
@@ -269,7 +266,11 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
mDefaultPitchPref.setOnPreferenceChangeListener(this); mDefaultPitchPref.setOnPreferenceChangeListener(this);
mDefaultPitchPref.setMax(getPitchSeekBarProgressFromSpeechPitchValue(MAX_SPEECH_PITCH)); mDefaultPitchPref.setMax(getPitchSeekBarProgressFromSpeechPitchValue(MAX_SPEECH_PITCH));
mCurrentEngine = mTts.getCurrentEngine(); if (mTts != null) {
mCurrentEngine = mTts.getCurrentEngine();
mTts.setSpeechRate(mDefaultRate/100.0f);
mTts.setPitch(mDefaultPitch/100.0f);
}
SettingsActivity activity = null; SettingsActivity activity = null;
if (getActivity() instanceof SettingsActivity) { if (getActivity() instanceof SettingsActivity) {