drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of a4eb81b6 to lmp-dev

Browse Source 
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
This commit is contained in:
Nick Kralevich
2014-10-14 08:38:05 -07:00
parent f715da3d6b a4eb81b67c
commit 0ae82b05be
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
docs/html/guide/topics/connectivity/nfc/nfc.jd
View File

@ -105,8 +105,8 @@ or more records ({@link android.nfc.NdefRecord}). Each NDEF record must be well-
the specification of the type of record that you want to create. Android the specification of the type of record that you want to create. Android
also supports other types of tags that do not contain NDEF data, which you can work with by using also supports other types of tags that do not contain NDEF data, which you can work with by using
the classes in the {@link android.nfc.tech} package. To learn more the classes in the {@link android.nfc.tech} package. To learn more
about these technologies, see the <a href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html">Advanced about these technologies, see the <a href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html
NFC</a> topic. Working with these other types of tags involves ">Advanced NFC</a> topic. Working with these other types of tags involves
writing your own protocol stack to communicate with the tags, so we recommend using NDEF when writing your own protocol stack to communicate with the tags, so we recommend using NDEF when
possible for ease of development and maximum support for Android-powered devices. possible for ease of development and maximum support for Android-powered devices.
</p> </p>
@ -477,8 +477,8 @@ tag from the intent. Intents can contain the following extras depending on the t
<li>{@link android.nfc.NfcAdapter#EXTRA_TAG} (required): A {@link android.nfc.Tag} object <li>{@link android.nfc.NfcAdapter#EXTRA_TAG} (required): A {@link android.nfc.Tag} object
representing the scanned tag.</li> representing the scanned tag.</li>
<li>{@link android.nfc.NfcAdapter#EXTRA_NDEF_MESSAGES} (optional): An array of NDEF messages <li>{@link android.nfc.NfcAdapter#EXTRA_NDEF_MESSAGES} (optional): An array of NDEF messages
parsed from the tag. This extra is mandatory on {@link android.nfc.NfcAdapter#ACTION_NDEF_DISCOVERED} parsed from the tag. This extra is mandatory on
intents.</li> {@link android.nfc.NfcAdapter#ACTION_NDEF_DISCOVERED} intents.</li>
<li>{@link android.nfc.NfcAdapter#EXTRA_ID} (optional): The low-level ID of the tag.</li></ul> <li>{@link android.nfc.NfcAdapter#EXTRA_ID} (optional): The low-level ID of the tag.</li></ul>
<p>To obtain these extras, check to see if your activity was launched with one of <p>To obtain these extras, check to see if your activity was launched with one of
@ -513,7 +513,8 @@ contain the payload and allow you to enumerate the tag's technologies:</p>
<p>This section describes how to create common types of NDEF records to help you when writing to <p>This section describes how to create common types of NDEF records to help you when writing to
NFC tags or sending data with Android Beam. Starting with Android 4.0 (API level 14), the NFC tags or sending data with Android Beam. Starting with Android 4.0 (API level 14), the
{@link android.nfc.NdefRecord#createUri createUri()} method is available to help you create {@link android.nfc.NdefRecord#createUri createUri()} method is available to help you create
URI records automatically. Starting in Android 4.1 (API level 16), {@link android.nfc.NdefRecord#createExternal createExternal()} URI records automatically. Starting in Android 4.1 (API level 16),
{@link android.nfc.NdefRecord#createExternal createExternal()}
and {@link android.nfc.NdefRecord#createMime createMime()} are available to help you create and {@link android.nfc.NdefRecord#createMime createMime()} are available to help you create
MIME and external type NDEF records. Use these helper methods whenever possible to avoid mistakes MIME and external type NDEF records. Use these helper methods whenever possible to avoid mistakes
when manually creating NDEF records.</p> when manually creating NDEF records.</p>
@ -528,7 +529,8 @@ record of the NDEF message that you are writing to a tag or beaming.</p>
<a href="#well-known-uri"><code>RTD_URI</code></a> type instead <a href="#well-known-uri"><code>RTD_URI</code></a> type instead
of {@link android.nfc.NdefRecord#TNF_ABSOLUTE_URI}, because it is more efficient.</p> of {@link android.nfc.NdefRecord#TNF_ABSOLUTE_URI}, because it is more efficient.</p>
<p>You can create a {@link android.nfc.NdefRecord#TNF_ABSOLUTE_URI} NDEF record in the following way:</p> <p>You can create a {@link android.nfc.NdefRecord#TNF_ABSOLUTE_URI} NDEF record in the following way
:</p>
<pre> <pre>
NdefRecord uriRecord = new NdefRecord( NdefRecord uriRecord = new NdefRecord(
@ -549,7 +551,8 @@ NdefRecord uriRecord = new NdefRecord(
</pre> </pre>
<h3 id="mime">TNF_MIME_MEDIA</h3> <h3 id="mime">TNF_MIME_MEDIA</h3>
<p>You can create a {@link android.nfc.NdefRecord#TNF_MIME_MEDIA} NDEF record in the following ways.</p> <p>You can create a {@link android.nfc.NdefRecord#TNF_MIME_MEDIA} NDEF record in the following ways:
</p>
<p>Using the {@link android.nfc.NdefRecord#createMime createMime()} method:</p> <p>Using the {@link android.nfc.NdefRecord#createMime createMime()} method:</p>
<pre> <pre>
@ -576,7 +579,8 @@ NdefRecord mimeRecord = new NdefRecord(
<h3 id="well-known-text">TNF_WELL_KNOWN with RTD_TEXT</h3> <h3 id="well-known-text">TNF_WELL_KNOWN with RTD_TEXT</h3>
<p>You can create a {@link android.nfc.NdefRecord#TNF_WELL_KNOWN} NDEF record in the following way:</p> <p>You can create a {@link android.nfc.NdefRecord#TNF_WELL_KNOWN} NDEF record in the following way:
</p>
<pre> <pre>
public NdefRecord createTextRecord(String payload, Locale locale, boolean encodeInUtf8) { public NdefRecord createTextRecord(String payload, Locale locale, boolean encodeInUtf8) {
byte[] langBytes = locale.getLanguage().getBytes(Charset.forName("US-ASCII")); byte[] langBytes = locale.getLanguage().getBytes(Charset.forName("US-ASCII"));
@ -606,7 +610,8 @@ public NdefRecord createTextRecord(String payload, Locale locale, boolean encode
<h3 id="well-known-uri">TNF_WELL_KNOWN with RTD_URI</h3> <h3 id="well-known-uri">TNF_WELL_KNOWN with RTD_URI</h3>
<p>You can create a {@link android.nfc.NdefRecord#TNF_WELL_KNOWN} NDEF record in the following ways.</p> <p>You can create a {@link android.nfc.NdefRecord#TNF_WELL_KNOWN} NDEF record in the following ways:
</p>
<p>Using the {@link android.nfc.NdefRecord#createUri(String)} method:</p> <p>Using the {@link android.nfc.NdefRecord#createUri(String)} method:</p>
<pre> <pre>
@ -642,7 +647,8 @@ NdefRecord rtdUriRecord = new NdefRecord(
</pre> </pre>
<h3 id="ext-type">TNF_EXTERNAL_TYPE</h3> <h3 id="ext-type">TNF_EXTERNAL_TYPE</h3>
<p>You can create a {@link android.nfc.NdefRecord#TNF_EXTERNAL_TYPE} NDEF record in the following ways:</p> <p>You can create a {@link android.nfc.NdefRecord#TNF_EXTERNAL_TYPE} NDEF record in the following
ways:</p>
<p>Using the {@link android.nfc.NdefRecord#createExternal createExternal()} method: <p>Using the {@link android.nfc.NdefRecord#createExternal createExternal()} method:
<pre> <pre>
@ -681,19 +687,19 @@ android.nfc.NdefRecord#TNF_EXTERNAL_TYPE} have a canonical format of:
declares that the <code>urn:nfc:ext:</code> portion of the URN must be ommitted from the declares that the <code>urn:nfc:ext:</code> portion of the URN must be ommitted from the
NDEF record. So all you need to provide is the domain (<code>example.com</code> in the example) NDEF record. So all you need to provide is the domain (<code>example.com</code> in the example)
and type (<code>externalType</code> in the example) separated by a colon. and type (<code>externalType</code> in the example) separated by a colon.
When dispatching TNF_EXTERNAL_TYPE, Android converts the <code>urn:nfc:ext:example.com:externalType</code> URN to a When dispatching TNF_EXTERNAL_TYPE, Android converts the <code>urn:nfc:ext:example.com:externalType
<code>vnd.android.nfc://ext/example.com:externalType</code> URI, which is what the intent filter in the example </code> URN to a <code>vnd.android.nfc://ext/example.com:externalType</code> URI, which is what the
declares.</p> intent filter in the example declares.</p>
<h3 id="aar">Android Application Records</h3> <h3 id="aar">Android Application Records</h3>
<p> <p>
Introduced in Android 4.0 (API level 14), an Android Application Record (AAR) provides a stronger Introduced in Android 4.0 (API level 14), an Android Application Record (AAR) provides a stronger
certainty that your application is started when an NFC tag is scanned. An AAR has the package name certainty that your application is started when an NFC tag is scanned. An AAR has the package name
of an application embedded inside an NDEF record. You can add an AAR to any NDEF record of your NDEF message, of an application embedded inside an NDEF record. You can add an AAR to any NDEF record of your NDEF
because Android searches the entire NDEF message for AARs. If it finds an AAR, it starts the application based message, because Android searches the entire NDEF message for AARs. If it finds an AAR, it starts
on the package name inside the AAR. If the application is not present on the device, the application based on the package name inside the AAR. If the application is not present on the
Google Play is launched to download the application.</p> device, Google Play is launched to download the application.</p>
<p>AARs are useful if you want to prevent other applications from filtering for the same intent and <p>AARs are useful if you want to prevent other applications from filtering for the same intent and
potentially handling specific tags that you have deployed. AARs are only supported at the potentially handling specific tags that you have deployed. AARs are only supported at the
@ -717,11 +723,11 @@ application based on the AAR.</li>
</p> </p>
<p class="note"><strong>Note:</strong> You can override AARs and the intent dispatch system with the <a <p class="note"><strong>Note:</strong> You can override AARs and the intent dispatch system with the
href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html#foreground-dispatch">foreground dispatch <ahref="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html#foreground-dispatch">foreground
system</a>, which allows a foreground activity to have priority when an NFC tag is discovered. dispatch system</a>, which allows a foreground activity to have priority when an NFC tag is
With this method, the activity must be in the foreground to discovered. With this method, the activity must be in the foreground to override AARs and the
override AARs and the intent dispatch system.</p> intent dispatch system.</p>
<p>If you still want to filter for scanned tags that do not contain an AAR, you can declare <p>If you still want to filter for scanned tags that do not contain an AAR, you can declare
intent filters as normal. This is useful if your application is interested in other tags intent filters as normal. This is useful if your application is interested in other tags
@ -799,9 +805,9 @@ API level 14 (Android 4.0) and later.</li>
<p class="note"><strong>Note:</strong> If your activity enables Android Beam and is <p class="note"><strong>Note:</strong> If your activity enables Android Beam and is
in the foreground, the standard intent dispatch system is disabled. However, if your activity also in the foreground, the standard intent dispatch system is disabled. However, if your activity also
enables <a href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html#foreground-dispatch">foreground enables <a href="{@docRoot}guide/topics/connectivity/nfc/advanced-nfc.html#foreground-dispatch">
dispatching</a>, then it can still scan tags that match the intent filters set in the foreground foreground dispatching</a>, then it can still scan tags that match the intent filters set in the
dispatching.</p> foreground dispatching.</p>
<p>To enable Android Beam:</p> <p>To enable Android Beam:</p>