diff options
| author | Joe Fernandez <joefernandez@google.com> | 2011-12-22 15:59:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-22 15:59:34 -0800 |
| commit | 2b072677538de979961b5bf527109fdab1713731 (patch) | |
| tree | abe7c7d86618d0efa1ace6e3b56e20161e458ed2 /core/java/android/nfc | |
| parent | 2bd0d74a5885f72435da228a00495bae72c07f6f (diff) | |
| parent | 201469f54522436be79d4d6665721049bfc74320 (diff) | |
| download | frameworks_base-2b072677538de979961b5bf527109fdab1713731.zip frameworks_base-2b072677538de979961b5bf527109fdab1713731.tar.gz frameworks_base-2b072677538de979961b5bf527109fdab1713731.tar.bz2 | |
am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '201469f54522436be79d4d6665721049bfc74320':
docs: Add developer guide cross-references, Project ACRE, round 4
Diffstat (limited to 'core/java/android/nfc')
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 6 | ||||
| -rw-r--r-- | core/java/android/nfc/NfcManager.java | 6 | ||||
| -rw-r--r-- | core/java/android/nfc/package.html | 9 |
3 files changed, 19 insertions, 2 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index f3c884d..53a0341 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -42,6 +42,12 @@ import android.util.Log; * <p> * Use the helper {@link #getDefaultAdapter(Context)} to get the default NFC * adapter for this Android device. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using NFC, read the + * <a href="{@docRoot}guide/topics/nfc/index.html">Near Field Communication</a> developer guide.</p> + * </div> */ public final class NfcAdapter { static final String TAG = "NFC"; diff --git a/core/java/android/nfc/NfcManager.java b/core/java/android/nfc/NfcManager.java index 2bbed57..ea08014 100644 --- a/core/java/android/nfc/NfcManager.java +++ b/core/java/android/nfc/NfcManager.java @@ -28,6 +28,12 @@ import android.content.Context; * Alternately, you can just call the static helper * {@link NfcAdapter#getDefaultAdapter(android.content.Context)}. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using NFC, read the + * <a href="{@docRoot}guide/topics/nfc/index.html">Near Field Communication</a> developer guide.</p> + * </div> + * * @see Context#getSystemService * @see NfcAdapter#getDefaultAdapter(android.content.Context) */ diff --git a/core/java/android/nfc/package.html b/core/java/android/nfc/package.html index 97bb29d..9e028a5 100644 --- a/core/java/android/nfc/package.html +++ b/core/java/android/nfc/package.html @@ -1,7 +1,11 @@ <HTML> <BODY> -Provides access to Near Field Communication (NFC) functionality, allowing applications to read -NDEF message in NFC tags. A "tag" may actually be another device that appears as a tag. +<p>Provides access to Near Field Communication (NFC) functionality, allowing applications to read +NDEF message in NFC tags. A "tag" may actually be another device that appears as a tag.</p> + +<p>For more information, see the +<a href="{@docRoot}guide/topics/nfc/index.html">Near Field Communication</a> developer guide.</p> +{@more} <p>Here's a summary of the classes:</p> @@ -24,5 +28,6 @@ type of data being shared and carries the data itself.</dd> <p class="note"><strong>Note:</strong> Not all Android-powered devices provide NFC functionality.</p> + </BODY> </HTML> |