diff options
| author | Robert Ly <robertly@google.com> | 2011-10-18 11:33:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-18 11:33:37 -0700 |
| commit | 7a236d06a6db5c2a68379a4dd1b2429d93bb8ecf (patch) | |
| tree | a999359b1f8569aa6ca7a7e38d41f040db41fb7a /docs | |
| parent | 6de2191a3c61f2ac6d8742be734e2595e6eb95b1 (diff) | |
| parent | d6462ab5472341f7b8ded552f2440c21baaa3873 (diff) | |
| download | frameworks_base-7a236d06a6db5c2a68379a4dd1b2429d93bb8ecf.zip frameworks_base-7a236d06a6db5c2a68379a4dd1b2429d93bb8ecf.tar.gz frameworks_base-7a236d06a6db5c2a68379a4dd1b2429d93bb8ecf.tar.bz2 | |
am d6462ab5: Merge "docs: fix mistakes" into ics-mr0
* commit 'd6462ab5472341f7b8ded552f2440c21baaa3873':
docs: fix mistakes
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/nfc/advanced-nfc.jd | 5 | ||||
| -rw-r--r-- | docs/html/guide/topics/nfc/nfc.jd | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/docs/html/guide/topics/nfc/advanced-nfc.jd b/docs/html/guide/topics/nfc/advanced-nfc.jd index 2b414aa..b43b559 100644 --- a/docs/html/guide/topics/nfc/advanced-nfc.jd +++ b/docs/html/guide/topics/nfc/advanced-nfc.jd @@ -33,9 +33,6 @@ use the {@link android.nfc.Tag#getTechList getTechList()} method to determine th supported by the tag and create the corresponding {@link android.nfc.tech.TagTechnology} object with one of classes provided by {@link android.nfc.tech} </p> - -<table> - <p class="table-caption" id="table1"> <strong>Table 1.</strong> Supported tag technologies</p> <table id="tech-table"> @@ -230,7 +227,7 @@ priority over other activities that handle the same intent. Using this system in <ol> <li>Add the following code in the <code>onCreate()</code> method of your activity: - <ol type="a"> + <ol> <li>Create a {@link android.app.PendingIntent} object so the Android system can populate it with the details of the tag when it is scanned. <pre> diff --git a/docs/html/guide/topics/nfc/nfc.jd b/docs/html/guide/topics/nfc/nfc.jd index 892e418..175bc7c 100644 --- a/docs/html/guide/topics/nfc/nfc.jd +++ b/docs/html/guide/topics/nfc/nfc.jd @@ -12,6 +12,7 @@ page.title=NFC Basics <li><a href="#dispatching">How NFC Tags are Dispatched to Applications</a></li> </ol> </li> + <li><a href="#manifest">Requesting NFC Access in the Android Manifest</a></li> <li><a href="#filtering-intents">Filtering for Intents</a> <ol> <li><a href="#ndef-disc">ACTION_NDEF_DISCOVERED</a></li> |