diff options
| author | Charles Chen <clchen@google.com> | 2010-04-12 20:38:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-12 20:38:32 -0700 |
| commit | c06bb82f37f476813ea69dfd9f1514551719ac3b (patch) | |
| tree | c937da211e3f283411fa1f528aa8cf71689464a4 /src/com | |
| parent | 91523d601a6569ce9295a5617ca92a24582ff502 (diff) | |
| parent | 8ca7d88c1bdb7e2a233e48f67477c56d6c7f42a3 (diff) | |
| download | packages_apps_Settings-c06bb82f37f476813ea69dfd9f1514551719ac3b.zip packages_apps_Settings-c06bb82f37f476813ea69dfd9f1514551719ac3b.tar.gz packages_apps_Settings-c06bb82f37f476813ea69dfd9f1514551719ac3b.tar.bz2 | |
Merge "Fixing bug #2591288" into froyo
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/TextToSpeechSettings.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java index 84b14a1..04287be 100644 --- a/src/com/android/settings/TextToSpeechSettings.java +++ b/src/com/android/settings/TextToSpeechSettings.java @@ -408,7 +408,17 @@ public class TextToSpeechSettings extends PreferenceActivity implements (ListPreference) findPreference("tts_default_lang"); CharSequence[] entries = new CharSequence[available.size()]; CharSequence[] entryValues = new CharSequence[available.size()]; - for (int i=0; i<available.size(); i++){ + int selectedLanguageIndex = -1; + String selectedLanguagePref = mDefaultLanguage; + if (mDefaultCountry.length() > 0) { + selectedLanguagePref = selectedLanguagePref + LOCALE_DELIMITER + + mDefaultCountry; + } + if (mDefaultLocVariant.length() > 0) { + selectedLanguagePref = selectedLanguagePref + LOCALE_DELIMITER + + mDefaultLocVariant; + } + for (int i = 0; i < available.size(); i++){ String[] langCountryVariant = available.get(i).split("-"); Locale loc = null; if (langCountryVariant.length == 1){ @@ -422,10 +432,16 @@ public class TextToSpeechSettings extends PreferenceActivity implements if (loc != null){ entries[i] = loc.getDisplayName(); entryValues[i] = available.get(i); + if (entryValues[i].equals(selectedLanguagePref)){ + selectedLanguageIndex = i; + } } } ttsLanguagePref.setEntries(entries); ttsLanguagePref.setEntryValues(entryValues); + if (selectedLanguageIndex > -1) { + ttsLanguagePref.setValueIndex(selectedLanguageIndex); + } mEnableDemo = true; // Make sure that the default language can be used. int languageResult = mTts.setLanguage( |