summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/TextToSpeechSettings.java
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2009-09-01 13:36:45 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2009-09-01 13:46:44 -0700
commitab6552c3f01f893ca927fc8ef0fec95a6c8f178f (patch)
treec881668cae4cb8c6d843fe150a88264591e98be2 /src/com/android/settings/TextToSpeechSettings.java
parentc58c549cc963bd8946d332a0f9945d9a1ed19e99 (diff)
downloadpackages_apps_Settings-ab6552c3f01f893ca927fc8ef0fec95a6c8f178f.zip
packages_apps_Settings-ab6552c3f01f893ca927fc8ef0fec95a6c8f178f.tar.gz
packages_apps_Settings-ab6552c3f01f893ca927fc8ef0fec95a6c8f178f.tar.bz2
Make sure the TTS example in the TTS Settings loads a supported language.
This fixes the issue where the example wouldn't play when the UI is in Japanese in bug 2088099.
Diffstat (limited to 'src/com/android/settings/TextToSpeechSettings.java')
-rw-r--r--src/com/android/settings/TextToSpeechSettings.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index d3d59fa..12286c1 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -265,6 +265,12 @@ public class TextToSpeechSettings extends PreferenceActivity implements
if (status == TextToSpeech.SUCCESS) {
Log.v(TAG, "TTS engine for settings screen initialized.");
mEnableDemo = true;
+ // check to see if the current locale is supported
+ if (mTts.isLanguageAvailable(Locale.getDefault()) == TextToSpeech.LANG_NOT_SUPPORTED) {
+ mTts.setLanguage(Locale.US);
+ } else {
+ mTts.setLanguage(Locale.getDefault());
+ }
} else {
Log.v(TAG, "TTS engine for settings screen failed to initialize successfully.");
mEnableDemo = false;
@@ -282,7 +288,6 @@ public class TextToSpeechSettings extends PreferenceActivity implements
Log.v(TAG, "Voice data check passed");
if (mTts == null) {
mTts = new TextToSpeech(this, this);
- mTts.setLanguage(Locale.getDefault());
}
} else {
Log.v(TAG, "Voice data check failed");