Skip to content

Commit

Permalink
am 5d0806c: Merge change Ia70bd8c4 into eclair
Browse files Browse the repository at this point in the history
Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2

* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
  add BluetoothChat sample app to the dev guide
  • Loading branch information
scottamain authored and Android Git Automerger committed Dec 4, 2009
2 parents 8d670d3 + 5d0806c commit e08361d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,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 \
Expand Down
3 changes: 3 additions & 0 deletions docs/html/guide/guide_toc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,9 @@ localized titles are added in the language order specified below.
<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>
Expand Down
3 changes: 3 additions & 0 deletions docs/html/guide/samples/index.jd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e08361d

Please sign in to comment.