Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18dedf2c authored by Trevor Johns's avatar Trevor Johns Committed by Android Git Automerger
Browse files

am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the... 

am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair

Merge commit '50a3977c' into eclair-plus-aosp

* commit '50a3977c':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
parents 6b113b1a 50a3977c

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ web_docs_sample_code_flags := \ 
		            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 \

docs/html/resources/resources_toc.cs

+3 −0
Original line number Diff line number Diff line
@@ -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>

docs/html/resources/samples/images/BusinessCard1.png

0 → 100644
+6.27 KiB
Loading image diff...

docs/html/resources/samples/images/BusinessCard2.png

0 → 100644
+8.69 KiB
Loading image diff...

docs/html/resources/samples/index.jd

+6 −0
Original line number Diff line number Diff line
@@ -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