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

am 72529f17: am ccd80ec9: Fix for setting TTS language to recently downloaded one

Browse Source 
* commit '72529f179b6ba1c0f0430f31d97dd4fedbbfbb11':
  Fix for setting TTS language to recently downloaded one
This commit is contained in:
Przemyslaw Szczepaniak
2012-08-14 08:33:56 -07:00
committed by Android Git Automerger
parent ceb001a728 72529f179b
commit 178eba477d
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/tts/TtsEngineSettingsFragment.java
View File

@@ -104,7 +104,8 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
mInstallVoicesPreference.setOnPreferenceClickListener(this);
// Remove this preference unless voices are indeed available to install.
root.removePreference(mInstallVoicesPreference);
// Remove this preference unless locales are indeed available.
root.removePreference(mLocalePreference);
root.setTitle(getEngineLabel());
root.setKey(getEngineName());
@@ -121,8 +122,6 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
mVoiceDataDetails = getArguments().getParcelable(TtsEnginePreference.FRAGMENT_ARGS_VOICES);
updateVoiceDetails();
mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
getEngineName());
@@ -169,9 +168,8 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
if (available == null){
Log.e(TAG, "TTS data check failed (available == null).");
final CharSequence[] empty = new CharSequence[0];
mLocalePreference.setEntries(empty);
mLocalePreference.setEntryValues(empty);
mLocalePreference.setEnabled(false);
getPreferenceScreen().removePreference(mLocalePreference);
return;
}
@@ -183,11 +181,12 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
}
if (available.size() > 0) {
mLocalePreference.setEnabled(true);
getPreferenceScreen().addPreference(mLocalePreference);
updateDefaultLocalePref(available);
} else {
final CharSequence[] empty = new CharSequence[0];
mLocalePreference.setEntries(empty);
mLocalePreference.setEntryValues(empty);
mLocalePreference.setEnabled(false);
getPreferenceScreen().removePreference(mLocalePreference);
}
}