diff options
| author | Trevor Johns <trevorjohns@google.com> | 2010-01-11 14:08:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-11 14:08:15 -0800 |
| commit | 9cebb377c57f3231dbdf278678596871abcef2b8 (patch) | |
| tree | 80897795e03517c0c970320d2d9c99eabd2e21b7 /docs/html/resources | |
| parent | 44641d3db3b5fd5c7616c8a646ec8b6af20baa18 (diff) | |
| parent | 18dedf2cdfd2c78d93061f20c4269f00449a8e6a (diff) | |
| download | frameworks_base-9cebb377c57f3231dbdf278678596871abcef2b8.zip frameworks_base-9cebb377c57f3231dbdf278678596871abcef2b8.tar.gz frameworks_base-9cebb377c57f3231dbdf278678596871abcef2b8.tar.bz2 | |
am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'
* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Diffstat (limited to 'docs/html/resources')
| -rw-r--r-- | docs/html/resources/resources_toc.cs | 3 | ||||
| -rw-r--r-- | docs/html/resources/samples/images/BusinessCard1.png | bin | 0 -> 6425 bytes | |||
| -rw-r--r-- | docs/html/resources/samples/images/BusinessCard2.png | bin | 0 -> 8902 bytes | |||
| -rw-r--r-- | docs/html/resources/samples/index.jd | 6 |
4 files changed, 9 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 0000000..55ff7e5 --- /dev/null +++ b/docs/html/resources/samples/images/BusinessCard1.png diff --git a/docs/html/resources/samples/images/BusinessCard2.png b/docs/html/resources/samples/images/BusinessCard2.png Binary files differnew file mode 100644 index 0000000..347c317 --- /dev/null +++ b/docs/html/resources/samples/images/BusinessCard2.png 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 @@ platforms) and allow you to view the source files in your browser. </p> <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 |
