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

Merge "Fix two bug in the TTS settings." into ics-mr1

Browse Source
This commit is contained in:
Narayan Kamath
2011-11-07 02:26:29 -08:00
committed by Android (Google) Code Review
parent 9c4f31c119 fdd94d87de
commit 8214d201db
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -717,7 +717,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.TextToSpeechSettings" /> android:value="com.android.settings.tts.TextToSpeechSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/language_settings" /> android:resource="@id/language_settings" />
</activity> </activity>

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

@@ -95,12 +95,15 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
ArrayList<String> unavailable = voiceDataDetails.getStringArrayListExtra( ArrayList<String> unavailable = voiceDataDetails.getStringArrayListExtra(
TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES); TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
if (available == null || unavailable == null){ if (available == null){
Log.e(TAG, "TTS data check failed (available == null)."); Log.e(TAG, "TTS data check failed (available == null).");
final CharSequence[] empty = new CharSequence[0];
mLocalePreference.setEntries(empty);
mLocalePreference.setEntryValues(empty);
return; return;
} }
if (unavailable.size() > 0) { if (unavailable != null && unavailable.size() > 0) {
mInstallVoicesPreference.setEnabled(true); mInstallVoicesPreference.setEnabled(true);
getPreferenceScreen().addPreference(mInstallVoicesPreference); getPreferenceScreen().addPreference(mInstallVoicesPreference);
} else { } else {