summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorCharles Chen <clchen@google.com>2010-04-08 09:45:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-08 09:45:17 -0700
commit755cb302e90b06820b313c09abfdf35ab899132c (patch)
tree2b87acb1364578062a44da5d18e8005af6c23583 /src/com
parent3a95f92650e6bd9a994048878abda0950c11ec8b (diff)
parent510bc4a2c3470e3f47e6bbc5417051dd442e7664 (diff)
downloadpackages_apps_Settings-755cb302e90b06820b313c09abfdf35ab899132c.zip
packages_apps_Settings-755cb302e90b06820b313c09abfdf35ab899132c.tar.gz
packages_apps_Settings-755cb302e90b06820b313c09abfdf35ab899132c.tar.bz2
Merge "Fix for 2579445 - Using the correct strings for accessing Intent extras now." into froyo
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/TextToSpeechSettings.java5
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.