diff options
| author | Scott Main <smain@google.com> | 2009-12-03 16:14:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 16:14:32 -0800 |
| commit | 4bc7e535177e62630f8d8a8298d77fc9694e43ad (patch) | |
| tree | 9f0495ea20fb5fd421398828c60f6fd7fc701189 | |
| parent | a7183a9763498c93cc567577a867854b4db3814f (diff) | |
| parent | 5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6 (diff) | |
| download | frameworks_base-4bc7e535177e62630f8d8a8298d77fc9694e43ad.zip frameworks_base-4bc7e535177e62630f8d8a8298d77fc9694e43ad.tar.gz frameworks_base-4bc7e535177e62630f8d8a8298d77fc9694e43ad.tar.bz2 | |
am 5d0806c9: Merge change Ia70bd8c4 into eclair
Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-plus-aosp
* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 3 | ||||
| -rw-r--r-- | docs/html/guide/samples/index.jd | 3 |
3 files changed, 8 insertions, 0 deletions
@@ -357,6 +357,8 @@ web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ -samplecode $(sample_dir)/ApiDemos \ guide/samples/ApiDemos "API Demos" \ + -samplecode $(sample_dir)/BluetoothChat \ + guide/samples/BluetoothChat "Bluetooth Chat" \ -samplecode $(sample_dir)/Home \ guide/samples/Home "Home" \ -samplecode $(sample_dir)/JetBoy \ diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 5fbfd4e..c28cde1 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -396,6 +396,9 @@ <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html"> <span class="en">API Demos</span> </a></li> + <li><a href="<?cs var:toroot ?>guide/samples/BluetoothChat/index.html"> + <span class="en">Bluetooth Chat</span> + </a></li> <li><a href="<?cs var:toroot ?>guide/samples/Home/index.html"> <span class="en">Home</span> </a></li> diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd index 06aa83c..4fca8da 100644 --- a/docs/html/guide/samples/index.jd +++ b/docs/html/guide/samples/index.jd @@ -33,6 +33,9 @@ platforms) and allow you to view the source files in your browser. </p> <dt><a href="ApiDemos/index.html">API Demos</a></dt> <dd>A variety of small applications that demonstrate an extensive collection of framework topics.</dd> + + <dt><a href="BluetoothChat/index.html">Bluetooth Chat</a></dt> + <dd>An application for two-way text messaging over Bluetooth.</dd> <dt><a href="Home/index.html">Home</a></dt> <dd>An application for saving notes. Similar (but not identical) to the |