diff options
| author | Megha Joshi <mjoshi@google.com> | 2010-11-12 18:46:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-12 18:46:38 -0800 |
| commit | 7e059716923cd02a4c42751c67892e090bfd5f33 (patch) | |
| tree | dfbf015f3330856b6ac25d7a3532b2a0fa285b54 | |
| parent | 16555c60f7231b014375cbc62fd83b1c53879984 (diff) | |
| parent | 48c698fc1497a01743f9ce5ab6fb8f6700847259 (diff) | |
| download | frameworks_base-7e059716923cd02a4c42751c67892e090bfd5f33.zip frameworks_base-7e059716923cd02a4c42751c67892e090bfd5f33.tar.gz frameworks_base-7e059716923cd02a4c42751c67892e090bfd5f33.tar.bz2 | |
am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
Adding NFC sample resources (DO NOT MERGE)
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | docs/html/resources/resources_toc.cs | 3 | ||||
| -rw-r--r-- | docs/html/resources/samples/images/NfcDemo.png | bin | 0 -> 12750 bytes | |||
| -rw-r--r-- | docs/html/resources/samples/index.jd | 3 |
4 files changed, 8 insertions, 0 deletions
@@ -436,6 +436,8 @@ web_docs_sample_code_flags := \ resources/samples/WiktionarySimple "Wiktionary (Simplified)" \ -samplecode $(sample_dir)/VoiceRecognitionService \ resources/samples/VoiceRecognitionService "Voice Recognition Service" + -samplecode $(sample_dir)/NFCDemo \ + resources/samples/NFCDemo "NFC Demo" ## SDK version identifiers used in the published docs # major[.minor] version for current SDK. (full releases only) diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index 117ecfb..ed23c7c 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -227,6 +227,9 @@ <li><a href="<?cs var:toroot ?>resources/samples/MultiResolution/index.html"> <span class="en">Multiple Resolutions</span> </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"> <span class="en">Note Pad</span> </a></li> diff --git a/docs/html/resources/samples/images/NfcDemo.png b/docs/html/resources/samples/images/NfcDemo.png Binary files differnew file mode 100644 index 0000000..c175d12 --- /dev/null +++ b/docs/html/resources/samples/images/NfcDemo.png diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd index cbe6ca3..5749728 100644 --- a/docs/html/resources/samples/index.jd +++ b/docs/html/resources/samples/index.jd @@ -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 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> <dd>An application for saving notes. Similar (but not identical) to the <a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd> |
