summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMegha Joshi <mjoshi@google.com>2010-11-03 15:15:22 -0700
committerMegha Joshi <mjoshi@google.com>2010-11-12 18:35:49 -0800
commit48c698fc1497a01743f9ce5ab6fb8f6700847259 (patch)
tree090b4a7d182aaa607443bd6debf91d6548463f6e
parentd6b9d078ecf1b4d7cc57375830cf2ce390fc893c (diff)
downloadframeworks_base-48c698fc1497a01743f9ce5ab6fb8f6700847259.zip
frameworks_base-48c698fc1497a01743f9ce5ab6fb8f6700847259.tar.gz
frameworks_base-48c698fc1497a01743f9ce5ab6fb8f6700847259.tar.bz2
Adding NFC sample resources (DO NOT MERGE)
Change-Id: I687d07ebe4f8bd0c5dec30e69af0d3e880a68230
-rw-r--r--Android.mk2
-rw-r--r--docs/html/resources/resources_toc.cs3
-rw-r--r--docs/html/resources/samples/images/NfcDemo.pngbin0 -> 12750 bytes
-rw-r--r--docs/html/resources/samples/index.jd3
4 files changed, 8 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 1c8051b..89e47b5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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
new file mode 100644
index 0000000..c175d12
--- /dev/null
+++ b/docs/html/resources/samples/images/NfcDemo.png
Binary files differ
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>