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

am 628431de: Fix bug 1956707 in which setting the default language has no effect. Use the current Locale upon initialization of the TTS engine. Retrieve the default engine value from the TextToSpeech.Engine class instead of a hard-coded value in TextToSpeechSettings.

Browse Source 
Merge commit '628431de91689b62a19e5fde0ed3b546bba7da74'

* commit '628431de91689b62a19e5fde0ed3b546bba7da74':
  Fix bug 1956707 in which setting the default language has no effect.
This commit is contained in:
Jean-Michel Trivi
2009-07-19 20:28:43 -07:00
committed by Android Git Automerger
parent 2fab4ab09c 628431de91
commit 0c37d2ea12
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,8 @@ public class TextToSpeechSettings extends PreferenceActivity implements
private static final String LOCALE_DELIMITER = "-"; private static final String LOCALE_DELIMITER = "-";
// TODO move this to android.speech.tts.TextToSpeech.Engine private static final String FALLBACK_TTS_DEFAULT_SYNTH =
private static final String FALLBACK_TTS_DEFAULT_SYNTH = "com.svox.pico"; TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_SYNTH;
private Preference mPlayExample = null; private Preference mPlayExample = null;
private Preference mInstallData = null; private Preference mInstallData = null;
@@ -280,6 +280,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
Log.v(TAG, "Voice data check passed"); Log.v(TAG, "Voice data check passed");
if (mTts == null) { if (mTts == null) {
mTts = new TextToSpeech(this, this); mTts = new TextToSpeech(this, this);
mTts.setLanguage(Locale.getDefault());
} }
} else { } else {
Log.v(TAG, "Voice data check failed"); Log.v(TAG, "Voice data check failed");
@@ -319,6 +320,9 @@ public class TextToSpeechSettings extends PreferenceActivity implements
Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, mDefaultLocVariant); Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, mDefaultLocVariant);
Log.v(TAG, "TTS default lang/country/variant set to " Log.v(TAG, "TTS default lang/country/variant set to "
+ mDefaultLanguage + "/" + mDefaultCountry + "/" + mDefaultLocVariant); + mDefaultLanguage + "/" + mDefaultCountry + "/" + mDefaultLocVariant);
if (mTts != null) {
mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry));
}
} }
return true; return true;