summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Chung <fchung@google.com>2011-11-14 11:39:23 -0800
committerFred Chung <fchung@google.com>2011-11-16 15:24:08 -0800
commit2d410df1c7852aec4131f276841758d43e9507f1 (patch)
treeb4d9eb4b013145925215a2e9a5feb719ae105b4b
parentd28bb28e080f1dcd27f5b4f8b697d77cac09495b (diff)
downloadbase-2d410df1c7852aec4131f276841758d43e9507f1.tar.gz
DO NOT MERGE: Bluetooth HDP sample.
Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e Change-Id: I6f9bd5fec6e841395b9fc85d419510c81bfb620c
-rw-r--r--Android.mk2
-rw-r--r--docs/html/resources/resources-data.js10
-rw-r--r--docs/html/resources/samples/images/BluetoothHDP.pngbin0 -> 58734 bytes
3 files changed, 12 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 586eb4ac01ec..a748b7b3f30a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -412,6 +412,8 @@ web_docs_sample_code_flags := \
resources/samples/BackupRestore "Backup and Restore" \
-samplecode $(sample_dir)/BluetoothChat \
resources/samples/BluetoothChat "Bluetooth Chat" \
+ -samplecode $(sample_dir)/BluetoothHDP \
+ resources/samples/BluetoothHDP "Bluetooth HDP Demo" \
-samplecode $(sample_dir)/BusinessCard \
resources/samples/BusinessCard "Business Card" \
-samplecode $(sample_dir)/ContactManager \
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 41a5a510fa11..a35e6848f1b9 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -468,6 +468,16 @@ var ANDROID_RESOURCES = [
}
},
{
+ tags: ['sample', 'communication', 'new'],
+ path: 'samples/BluetoothHDP/index.html',
+ title: {
+ en: 'Bluetooth HDP Demo'
+ },
+ description: {
+ en: 'A sample application that demonstrates how to communicate with a Bluetooth Health Device Profile (HDP) device.'
+ }
+ },
+ {
tags: ['sample', 'accountsync'],
path: 'samples/BusinessCard/index.html',
title: {
diff --git a/docs/html/resources/samples/images/BluetoothHDP.png b/docs/html/resources/samples/images/BluetoothHDP.png
new file mode 100644
index 000000000000..c04cfde46681
--- /dev/null
+++ b/docs/html/resources/samples/images/BluetoothHDP.png
Binary files differ