summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2011-07-06 02:01:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-06 02:01:59 -0700
commit42de13c3b01daa755cb6b7b83b3429c53238fd4a (patch)
tree397ca46e155555bdb2a9b4cfdf19209ab0a2f08a
parente074e221a8d80b79ec2e8eca0dc026bfcce87cd2 (diff)
parentaf1ad3cc2d6152dfe62520a87bf5fa85337ca1ab (diff)
downloadframeworks_base-42de13c3b01daa755cb6b7b83b3429c53238fd4a.zip
frameworks_base-42de13c3b01daa755cb6b7b83b3429c53238fd4a.tar.gz
frameworks_base-42de13c3b01daa755cb6b7b83b3429c53238fd4a.tar.bz2
Merge "Add a sample app for the TTS engine API"
-rw-r--r--Android.mk4
-rw-r--r--docs/html/resources/resources-data.js10
2 files changed, 13 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index c2d4abc..9fbdde7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -450,7 +450,9 @@ web_docs_sample_code_flags := \
-samplecode $(sample_dir)/VoicemailProviderDemo \
resources/samples/VoicemailProviderDemo "Voicemail Provider Demo" \
-samplecode $(sample_dir)/XmlAdapters \
- resources/samples/XmlAdapters "XML Adapters"
+ resources/samples/XmlAdapters "XML Adapters" \
+ -samplecode $(sample_dir)/TtsEngine \
+ resources/samples/TtsEngine "Text To Speech Engine"
## SDK version identifiers used in the published docs
# major[.minor] version for current SDK. (full releases only)
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index e8c9ae7..0fc10bf 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -726,6 +726,16 @@ var ANDROID_RESOURCES = [
en: 'Binding data to views using XML Adapters examples.'
}
},
+ {
+ tags: ['sample', 'new', 'accessibility'],
+ path: 'samples/TtsEngine/index.html',
+ title: {
+ en: 'Text To Speech Engine'
+ },
+ description: {
+ en: 'An example Text To Speech engine written using the android text to speech engine API.'
+ }
+ },
/////////////////
/// TUTORIALS ///