am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp
* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
diff --git a/Android.mk b/Android.mk
index fb1a3a6..df04bea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -361,6 +361,8 @@
resources/samples/ApiDemos "API Demos" \
-samplecode $(sample_dir)/BluetoothChat \
resources/samples/BluetoothChat "Bluetooth Chat" \
+ -samplecode $(sample_dir)/BusinessCard \
+ resources/samples/BusinessCard "Business Card" \
-samplecode $(sample_dir)/ContactManager \
resources/samples/ContactManager "Contact Manager" \
-samplecode $(sample_dir)/Home \
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs
index 6aaf060..f5c573e 100644
--- a/docs/html/resources/resources_toc.cs
+++ b/docs/html/resources/resources_toc.cs
@@ -179,6 +179,9 @@
<li><a href="<?cs var:toroot ?>resources/samples/BluetoothChat/index.html">
<span class="en">Bluetooth Chat</span>
</a> <span class="new">new!</span></li>
+ <li><a href="<?cs var:toroot ?>resources/samples/BusinessCard/index.html">
+ <span class="en">Business Card</span>
+ </a> <span class="new">new!</span></li>
<li><a href="<?cs var:toroot ?>resources/samples/ContactManager/index.html">
<span class="en">Contact Manager</span>
</a> <span class="new">new!</span></li>
diff --git a/docs/html/resources/samples/images/BusinessCard1.png b/docs/html/resources/samples/images/BusinessCard1.png
new file mode 100644
index 0000000..55ff7e5
--- /dev/null
+++ b/docs/html/resources/samples/images/BusinessCard1.png
Binary files differ
diff --git a/docs/html/resources/samples/images/BusinessCard2.png b/docs/html/resources/samples/images/BusinessCard2.png
new file mode 100644
index 0000000..347c317
--- /dev/null
+++ b/docs/html/resources/samples/images/BusinessCard2.png
Binary files differ
diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd
index 8ab6f43b..0beb781 100644
--- a/docs/html/resources/samples/index.jd
+++ b/docs/html/resources/samples/index.jd
@@ -42,6 +42,12 @@
<dt><a href="BluetoothChat/index.html">Bluetooth Chat</a></dt>
<dd>An application for two-way text messaging over Bluetooth.</dd>
+ <dt><a href="BusinessCard/index.html">BusinessCard</a></dt>
+ <dd>An application that demonstrates how to launch the built-in contact
+ picker from within an activity. This sample also uses reflection to ensure
+ that the correct version of the contacts API is used, depending on which
+ API level the application is running under.</dd>
+
<dt><a href="ContactManager/index.html">Contact Manager</a></dt>
<dd>An application that demonstrates how to query the system contacts provider
using the <code>ContactsContract</code> API, as
