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

Set the minimum speech rate to a value of ten instead of zero.

Browse Source 
Bug: 27093805
Change-Id: I090a9345c3b05937d1f790ea051945ac187ddb61
This commit is contained in:
shwetachahar
2016-04-15 16:40:37 +01:00
parent da4ecea845
commit d6fb2cd724
1 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,10 +90,11 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
private static final int VOICE_DATA_INTEGRITY_CHECK = 1977; private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
/** /**
* Maximum speech rate value. * Speech rate value.
* This value should be kept in sync with the max value set in tts_settings xml. * This value should be kept in sync with the max value set in tts_settings xml.
*/ */
private static final int MAX_SPEECH_RATE = 600; private static final int MAX_SPEECH_RATE = 600;
private static final int MIN_SPEECH_RATE = 10;
/** /**
* Speech pitch value. * Speech pitch value.
@@ -264,13 +265,15 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
mDefaultPitch = android.provider.Settings.Secure.getInt( mDefaultPitch = android.provider.Settings.Secure.getInt(
resolver, TTS_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH); resolver, TTS_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH);
mDefaultRatePref.setProgress(mDefaultRate); mDefaultRatePref.setProgress(getSeekBarProgressFromValue(KEY_DEFAULT_RATE, mDefaultRate));
mDefaultRatePref.setOnPreferenceChangeListener(this); mDefaultRatePref.setOnPreferenceChangeListener(this);
mDefaultRatePref.setMax(MAX_SPEECH_RATE); mDefaultRatePref.setMax(getSeekBarProgressFromValue(KEY_DEFAULT_RATE, MAX_SPEECH_RATE));
mDefaultPitchPref.setProgress(getPitchSeekBarProgressFromSpeechPitchValue(mDefaultPitch)); mDefaultPitchPref.setProgress(getSeekBarProgressFromValue(KEY_DEFAULT_PITCH,
mDefaultPitch));
mDefaultPitchPref.setOnPreferenceChangeListener(this); mDefaultPitchPref.setOnPreferenceChangeListener(this);
mDefaultPitchPref.setMax(getPitchSeekBarProgressFromSpeechPitchValue(MAX_SPEECH_PITCH)); mDefaultPitchPref.setMax(getSeekBarProgressFromValue(KEY_DEFAULT_PITCH,
MAX_SPEECH_PITCH));
if (mTts != null) { if (mTts != null) {
mCurrentEngine = mTts.getCurrentEngine(); mCurrentEngine = mTts.getCurrentEngine();
@@ -299,21 +302,31 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
} }
/** /**
* The minimum pitch value should be > 0 but the minimum value of a seekbar in android * The minimum speech pitch/rate value should be > 0 but the minimum value of a seekbar in
* is fixed at 0. Therefore, we increment the seekbar progress with MIN_SPEECH_PITCH value * android is fixed at 0. Therefore, we increment the seekbar progress with MIN_SPEECH_VALUE
* so that the minimum seekbar progress value is MIN_SPEECH_PITCH. * so that the minimum seekbar progress value is MIN_SPEECH_PITCH/RATE.
* PITCH_VALUE = MIN_SPEECH_PITCH + PITCH_SEEKBAR_PROGRESS * SPEECH_VALUE = MIN_SPEECH_VALUE + SEEKBAR_PROGRESS
*/ */
private int getSpeechPitchValueFromSeekBarProgress(int progress) { private int getValueFromSeekBarProgress(String preferenceKey, int progress) {
return MIN_SPEECH_PITCH + progress; if (preferenceKey.equals(KEY_DEFAULT_RATE)) {
return MIN_SPEECH_RATE + progress;
} else if (preferenceKey.equals(KEY_DEFAULT_PITCH)) {
return MIN_SPEECH_PITCH + progress;
}
return progress;
} }
/** /**
* Since we are appending the MIN_SPEECH_PITCH to the pitch seekbar progress, the pitch * Since we are appending the MIN_SPEECH value to the speech seekbar progress, the
* seekbar progress should be set to (pitchValue - MIN_SPEECH_PITCH). * speech seekbar progress should be set to (speechValue - MIN_SPEECH value).
*/ */
private int getPitchSeekBarProgressFromSpeechPitchValue(int pitchValue) { private int getSeekBarProgressFromValue(String preferenceKey, int value) {
return pitchValue - MIN_SPEECH_PITCH; if (preferenceKey.equals(KEY_DEFAULT_RATE)) {
return value - MIN_SPEECH_RATE;
} else if (preferenceKey.equals(KEY_DEFAULT_PITCH)) {
return value - MIN_SPEECH_PITCH;
}
return value;
} }
/** /**
@@ -518,7 +531,8 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
} }
/** /**
* Called when mPlayExample or mResetSpeechRate is clicked. * Called when mPlayExample, mResetSpeechRate or mResetSpeechPitch is
* clicked.
*/ */
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
@@ -528,22 +542,24 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
speakSampleText(); speakSampleText();
return true; return true;
} else if (preference == mResetSpeechRate) { } else if (preference == mResetSpeechRate) {
mDefaultRatePref.setProgress(TextToSpeech.Engine.DEFAULT_RATE); int speechRateSeekbarProgress = getSeekBarProgressFromValue(
updateSpeechRate(TextToSpeech.Engine.DEFAULT_RATE); KEY_DEFAULT_RATE, TextToSpeech.Engine.DEFAULT_RATE);
mDefaultRatePref.setProgress(speechRateSeekbarProgress);
updateSpeechRate(speechRateSeekbarProgress);
return true; return true;
} else if (preference == mResetSpeechPitch) { } else if (preference == mResetSpeechPitch) {
int pitchSeekbarProgress = getPitchSeekBarProgressFromSpeechPitchValue( int pitchSeekbarProgress = getSeekBarProgressFromValue(
TextToSpeech.Engine.DEFAULT_PITCH); KEY_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH);
mDefaultPitchPref.setProgress(pitchSeekbarProgress); mDefaultPitchPref.setProgress(pitchSeekbarProgress);
updateSpeechPitchValue(pitchSeekbarProgress); updateSpeechPitchValue(pitchSeekbarProgress);
return true; return true;
} }
return false; return false;
} }
private void updateSpeechRate(int speechRate) { private void updateSpeechRate(int speechRateSeekBarProgress) {
mDefaultRate = speechRate; mDefaultRate = getValueFromSeekBarProgress(KEY_DEFAULT_RATE,
speechRateSeekBarProgress);
try { try {
android.provider.Settings.Secure.putInt(getContentResolver(), android.provider.Settings.Secure.putInt(getContentResolver(),
TTS_DEFAULT_RATE, mDefaultRate); TTS_DEFAULT_RATE, mDefaultRate);
@@ -558,7 +574,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
} }
private void updateSpeechPitchValue(int speechPitchSeekBarProgress) { private void updateSpeechPitchValue(int speechPitchSeekBarProgress) {
mDefaultPitch = getSpeechPitchValueFromSeekBarProgress( mDefaultPitch = getValueFromSeekBarProgress(KEY_DEFAULT_PITCH,
speechPitchSeekBarProgress); speechPitchSeekBarProgress);
try { try {
android.provider.Settings.Secure.putInt(getContentResolver(), android.provider.Settings.Secure.putInt(getContentResolver(),