From d478cf09dff93015bc332f2707068f08bf603cfd Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 6 Jul 2009 17:58:52 -0700 Subject: Use the current Locale as the default language when TTS settings are not found, rather than a hardcoded value stored in TextToSpeech.Engine. --- packages/TtsService/src/android/tts/TtsService.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/TtsService/src/android/tts/TtsService.java b/packages/TtsService/src/android/tts/TtsService.java index 0bed72bd7ba2..10f4d6ecfaca 100755 --- a/packages/TtsService/src/android/tts/TtsService.java +++ b/packages/TtsService/src/android/tts/TtsService.java @@ -36,6 +36,7 @@ import android.util.Log; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.Locale; import java.util.concurrent.locks.ReentrantLock; /** @@ -183,7 +184,8 @@ public class TtsService extends Service implements OnCompletionListener { String defaultLang = android.provider.Settings.Secure.getString(mResolver, android.provider.Settings.Secure.TTS_DEFAULT_LANG); if (defaultLang == null) { - return TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_LANG; + // no setting found, use the current Locale to determine the default language + return Locale.getDefault().getISO3Language(); } else { return defaultLang; } @@ -194,7 +196,8 @@ public class TtsService extends Service implements OnCompletionListener { String defaultCountry = android.provider.Settings.Secure.getString(mResolver, android.provider.Settings.Secure.TTS_DEFAULT_COUNTRY); if (defaultCountry == null) { - return TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_COUNTRY; + // no setting found, use the current Locale to determine the default country + return Locale.getDefault().getISO3Country(); } else { return defaultCountry; } @@ -205,7 +208,8 @@ public class TtsService extends Service implements OnCompletionListener { String defaultVar = android.provider.Settings.Secure.getString(mResolver, android.provider.Settings.Secure.TTS_DEFAULT_VARIANT); if (defaultVar == null) { - return TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_VARIANT; + // no setting found, use the current Locale to determine the default variant + return Locale.getDefault().getVariant(); } else { return defaultVar; } -- cgit v1.2.3-59-g8ed1b