diff options
| author | Charles Chen <clchen@google.com> | 2010-04-08 09:52:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-08 09:52:18 -0700 |
| commit | add29bfbbbb4efcea5759f9b1a9e34d086c0535e (patch) | |
| tree | 8cd48c70959521052ea501ea3a2ccdc956bea2f2 /src | |
| parent | e6683e0ce1c78115ba493677bab28bdbf3ddf88e (diff) | |
| parent | 755cb302e90b06820b313c09abfdf35ab899132c (diff) | |
| download | packages_apps_Settings-add29bfbbbb4efcea5759f9b1a9e34d086c0535e.zip packages_apps_Settings-add29bfbbbb4efcea5759f9b1a9e34d086c0535e.tar.gz packages_apps_Settings-add29bfbbbb4efcea5759f9b1a9e34d086c0535e.tar.bz2 | |
am 755cb302: Merge "Fix for 2579445 - Using the correct strings for accessing Intent extras now." into froyo
Merge commit '755cb302e90b06820b313c09abfdf35ab899132c' into kraken
* commit '755cb302e90b06820b313c09abfdf35ab899132c':
Fix for 2579445 - Using the correct strings for accessing Intent extras now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/TextToSpeechSettings.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java index 5366bd0..d6e11d7 100644 --- a/src/com/android/settings/TextToSpeechSettings.java +++ b/src/com/android/settings/TextToSpeechSettings.java @@ -368,11 +368,10 @@ public class TextToSpeechSettings extends PreferenceActivity implements updateWidgetState(); return; } - // TODO (clchen): Add these extras to TextToSpeech.Engine ArrayList<String> available = - data.getStringArrayListExtra("TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES"); + data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES); ArrayList<String> unavailable = - data.getStringArrayListExtra("TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES"); + data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES); if ((available == null) || (unavailable == null)){ // The CHECK_TTS_DATA activity for the plugin did not run properly; // disable the preview and install controls and return. |