PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix unintentional drift

Browse Source 
Change-Id: Ie13a72e323e9a1d2c9ec3c034c33792be6634fec
This commit is contained in:
Jean-Baptiste Queru
2010-04-14 10:40:48 -07:00
parent 301827fd9d
commit 6e61b2177b
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/TextToSpeechSettings.java
View File

@@ -408,7 +408,17 @@ public class TextToSpeechSettings extends PreferenceActivity implements
(ListPreference) findPreference("tts_default_lang"); (ListPreference) findPreference("tts_default_lang");
CharSequence[] entries = new CharSequence[available.size()]; CharSequence[] entries = new CharSequence[available.size()];
CharSequence[] entryValues = 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("-"); String[] langCountryVariant = available.get(i).split("-");
Locale loc = null; Locale loc = null;
if (langCountryVariant.length == 1){ if (langCountryVariant.length == 1){
@@ -422,10 +432,16 @@ public class TextToSpeechSettings extends PreferenceActivity implements
if (loc != null){ if (loc != null){
entries[i] = loc.getDisplayName(); entries[i] = loc.getDisplayName();
entryValues[i] = available.get(i); entryValues[i] = available.get(i);
if (entryValues[i].equals(selectedLanguagePref)) {
selectedLanguageIndex = i;
}
} }
} }
ttsLanguagePref.setEntries(entries); ttsLanguagePref.setEntries(entries);
ttsLanguagePref.setEntryValues(entryValues); ttsLanguagePref.setEntryValues(entryValues);
if (selectedLanguageIndex > -1) {
ttsLanguagePref.setValueIndex(selectedLanguageIndex);
}
mEnableDemo = true; mEnableDemo = true;
// Make sure that the default language can be used. // Make sure that the default language can be used.
int languageResult = mTts.setLanguage( int languageResult = mTts.setLanguage(
@@ -653,8 +669,20 @@ public class TextToSpeechSettings extends PreferenceActivity implements
* Returns whether there is a default language in the TTS settings. * Returns whether there is a default language in the TTS settings.
*/ */
private boolean hasLangPref() { private boolean hasLangPref() {
String language = Settings.Secure.getString(getContentResolver(), TTS_DEFAULT_LANG); ContentResolver resolver = getContentResolver();
return (language != null); String language = Settings.Secure.getString(resolver, TTS_DEFAULT_LANG);
if ((language == null) || (language.length() < 1)) {
return false;
}
String country = Settings.Secure.getString(resolver, TTS_DEFAULT_COUNTRY);
if (country == null) {
return false;
}
String variant = Settings.Secure.getString(resolver, TTS_DEFAULT_VARIANT);
if (variant == null) {
return false;
}
return true;
} }
/** /**