Merge "docs: fix mistakes" into ics-mr0 (d6462ab5) · Commits · e / os / android_frameworks_base

docs/html/guide/topics/nfc/advanced-nfc.jd

+1 −4

Original line number	Diff line number	Diff line
		@@ -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>

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>