commit c8fd872e56c90086df5998aa385e7bece860df00
author Amith Yamasani <yamasani@google.com> Wed Feb 17 16:37:27 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 17 16:37:27 2010 -0800
tree 606e40aa1fa2a6f9286d0e97c05b4c53caeaf4fb
parent 8a7e63a0a9e752990f195880d462166904f72476
parent 0f2e6dec7c8dc136783eacb5b62c9d3248c4845a

Merge "Show current locale as summary for Select language setting."

src/com/android/settings/TextToSpeechSettings.java

diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index 86f9919..3c55d10 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -265,9 +265,15 @@
         if (status == TextToSpeech.SUCCESS) {
             Log.v(TAG, "TTS engine for settings screen initialized.");
             mEnableDemo = true;
-            if (mDefaultLanguage == null){
+            if (mDefaultLanguage == null) {
                 mDefaultLanguage = Locale.getDefault().getISO3Language();
             }
+            if (mDefaultCountry == null) {
+                mDefaultCountry = Locale.getDefault().getISO3Country();
+            }
+            if (mDefaultLocVariant == null) {
+                mDefaultLocVariant = new String();
+            }
             mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
             mTts.setSpeechRate((float)(mDefaultRate/100.0f));
         } else {