From 00d4fbfc42f2f4abf1a82f0854eb3d7c1ef1a04d Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Tue, 7 Jul 2009 17:08:32 -0700 Subject: [PATCH] In the TTS settings: rely on the default locale rather than default values stored in TextToSpeech.Engine to initialize the default TTS country and variant. --- src/com/android/settings/TextToSpeechSettings.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java index 11998a3537d..88bfc6703ec 100644 --- a/src/com/android/settings/TextToSpeechSettings.java +++ b/src/com/android/settings/TextToSpeechSettings.java @@ -191,8 +191,9 @@ public class TextToSpeechSettings extends PreferenceActivity implements country = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_COUNTRY); if (country == null) { // default country setting not found, initialize it, as well as the variant; - country = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_COUNTRY; - variant = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_VARIANT; + Locale currentLocale = Locale.getDefault(); + country = currentLocale.getISO3Country(); + variant = currentLocale.getVariant(); Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, country); Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant); } @@ -203,7 +204,8 @@ public class TextToSpeechSettings extends PreferenceActivity implements variant = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_VARIANT); if (variant == null) { // default variant setting not found, initialize it - variant = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_VARIANT; + Locale currentLocale = Locale.getDefault(); + variant = currentLocale.getVariant(); Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant); } }