Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 48c698fc: Adding NFC sample resources (DO NOT MERGE)

Browse Source 
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
  Adding NFC sample resources (DO NOT MERGE)
This commit is contained in:
Megha Joshi
2010-11-12 18:46:38 -08:00
committed by Android Git Automerger
parent 16555c60f7 48c698fc14
commit 7e05971692
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -436,6 +436,8 @@ web_docs_sample_code_flags := \
resources/samples/WiktionarySimple "Wiktionary (Simplified)" \ resources/samples/WiktionarySimple "Wiktionary (Simplified)" \
-samplecode $(sample_dir)/VoiceRecognitionService \ -samplecode $(sample_dir)/VoiceRecognitionService \
resources/samples/VoiceRecognitionService "Voice Recognition Service" resources/samples/VoiceRecognitionService "Voice Recognition Service"
-samplecode $(sample_dir)/NFCDemo \
resources/samples/NFCDemo "NFC Demo"
## SDK version identifiers used in the published docs ## SDK version identifiers used in the published docs
# major[.minor] version for current SDK. (full releases only) # major[.minor] version for current SDK. (full releases only)

3
docs/html/resources/resources_toc.cs
View File

@@ -227,6 +227,9 @@
<li><a href="<?cs var:toroot ?>resources/samples/MultiResolution/index.html"> <li><a href="<?cs var:toroot ?>resources/samples/MultiResolution/index.html">
<span class="en">Multiple Resolutions</span> <span class="en">Multiple Resolutions</span>
</a></li> </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/NFCDemo/index.html">
<span class="en">NFCDemo</span>
</a> <span class="new">new!</span></li>
<li><a href="<?cs var:toroot ?>resources/samples/NotePad/index.html"> <li><a href="<?cs var:toroot ?>resources/samples/NotePad/index.html">
<span class="en">Note Pad</span> <span class="en">Note Pad</span>
</a></li> </a></li>

BIN
docs/html/resources/samples/images/NfcDemo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

3
docs/html/resources/samples/index.jd
View File

@@ -58,6 +58,9 @@ href="{@docRoot}resources/samples/get.html">Getting the Samples</a>.</p>
<dd>A sample application that shows how to use resource directory qualifiers to <dd>A sample application that shows how to use resource directory qualifiers to
provide different resources for different screen configurations.</dd> provide different resources for different screen configurations.</dd>
<dt><a href="NFCDemo/index.html">NFCDemo</a></dt>
<dd>An application for reading NFC Forum Type 2 Tags using platform NFC apis.</a>.</dd>
<dt><a href="NotePad/index.html">Note Pad</a></dt> <dt><a href="NotePad/index.html">Note Pad</a></dt>
<dd>An application for saving notes. Similar (but not identical) to the <dd>An application for saving notes. Similar (but not identical) to the
<a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd> <a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>