diff options
author | Charles Chen <clchen@google.com> | 2010-02-12 11:04:05 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-12 11:04:05 -0800 |
commit | eadeebd1df04405e71d5a7b4dfba08d6d6afcc27 (patch) | |
tree | b78c819a4667439c9a4c2517723961476548be91 | |
parent | 4e52bcf2064609a3573d71ecc425b7e63ea907c3 (diff) | |
parent | cf3998bb4d67ea0805ac8fe1afd2c99c50bf3a41 (diff) | |
download | packages_apps_settings-eadeebd1df04405e71d5a7b4dfba08d6d6afcc27.zip packages_apps_settings-eadeebd1df04405e71d5a7b4dfba08d6d6afcc27.tar.gz packages_apps_settings-eadeebd1df04405e71d5a7b4dfba08d6d6afcc27.tar.bz2 |
Merge "Fixing a problem with the TextToSpeech settings failing to refresh the list of languages after the user has switched synthesis engines."
-rw-r--r-- | src/com/android/settings/TextToSpeechSettings.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java index 4a2f8c8..86f9919 100644 --- a/src/com/android/settings/TextToSpeechSettings.java +++ b/src/com/android/settings/TextToSpeechSettings.java @@ -265,7 +265,10 @@ public class TextToSpeechSettings extends PreferenceActivity implements if (status == TextToSpeech.SUCCESS) { Log.v(TAG, "TTS engine for settings screen initialized."); mEnableDemo = true; - mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry)); + if (mDefaultLanguage == null){ + mDefaultLanguage = Locale.getDefault().getISO3Language(); + } + mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant)); mTts.setSpeechRate((float)(mDefaultRate/100.0f)); } else { Log.v(TAG, "TTS engine for settings screen failed to initialize successfully."); @@ -368,17 +371,20 @@ public class TextToSpeechSettings extends PreferenceActivity implements Log.v(TAG, "TTS default lang/country/variant set to " + mDefaultLanguage + "/" + mDefaultCountry + "/" + mDefaultLocVariant); if (mTts != null) { - mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry)); + mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant)); } int newIndex = mDefaultLocPref.findIndexOfValue((String)objValue); Log.v("Settings", " selected is " + newIndex); mDemoStringIndex = newIndex > -1 ? newIndex : 0; } else if (KEY_TTS_DEFAULT_SYNTH.equals(preference.getKey())) { - // TODO: Do a data check here mDefaultEng = objValue.toString(); Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, mDefaultEng); if (mTts != null) { mTts.setEngineByPackageName(mDefaultEng); + mEnableDemo = false; + mVoicesMissing = false; + updateWidgetState(); + checkVoiceData(); } Log.v("Settings", "The default synth is: " + objValue.toString()); } |