Merge "framework/base changes to add new voicemail provider sample."
diff --git a/Android.mk b/Android.mk
index e3406ea..c838600 100644
--- a/Android.mk
+++ b/Android.mk
@@ -437,6 +437,8 @@
resources/samples/WiktionarySimple "Wiktionary (Simplified)" \
-samplecode $(sample_dir)/VoiceRecognitionService \
resources/samples/VoiceRecognitionService "Voice Recognition Service" \
+ -samplecode $(sample_dir)/VoicemailProviderDemo \
+ resources/samples/VoicemailProviderDemo "Voicemail Provider Demo" \
-samplecode $(sample_dir)/XmlAdapters \
resources/samples/XmlAdapters "XML Adapters"
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 7751c82..8d9b7b1 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -626,6 +626,16 @@
}
},
{
+ tags: ['sample', 'data', 'new'],
+ path: 'samples/VoicemailProviderDemo/index.html',
+ title: {
+ en: 'Voicemail Provider Demo'
+ },
+ description: {
+ en: 'A sample application to demonstrate how to use voicemail content provider APIs.'
+ }
+ },
+ {
tags: ['sample', 'ui', 'widgets'],
path: 'samples/Wiktionary/index.html',
title: {
diff --git a/docs/html/resources/samples/images/VoicemailProviderDemo.png b/docs/html/resources/samples/images/VoicemailProviderDemo.png
new file mode 100644
index 0000000..1a45d7a
--- /dev/null
+++ b/docs/html/resources/samples/images/VoicemailProviderDemo.png
Binary files differ
