diff options
| author | 2011-10-04 17:09:38 -0700 | |
|---|---|---|
| committer | 2011-10-04 17:09:38 -0700 | |
| commit | df5d7c882c5893fce13e0d2b6b2a97b177cb2692 (patch) | |
| tree | 8d5333ef10b11e0acb016dcb1183b38e3ef8b74b | |
| parent | 53902603a47e6be0113c6e48abbbbe09b680fe13 (diff) | |
| parent | d8afdb49ffaf727ff5d493854501d42c27faae28 (diff) | |
Merge "adding Android Beam sample"
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | docs/html/resources/resources-data.js | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index be8c25b714a1..c8b2555487ca 100644 --- a/Android.mk +++ b/Android.mk @@ -400,6 +400,8 @@ web_docs_sample_code_flags := \ resources/samples/AccessibilityService "Accessibility Service" \ -samplecode $(sample_dir)/AccelerometerPlay \ resources/samples/AccelerometerPlay "Accelerometer Play" \ + -samplecode $(sample_dir)/AndroidBeam \ + resources/samples/AndroidBeam "Android Beam" \ -samplecode $(sample_dir)/ApiDemos \ resources/samples/ApiDemos "API Demos" \ -samplecode $(sample_dir)/Support4Demos \ diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js index 6c5d882908d0..d7700eecd8dc 100644 --- a/docs/html/resources/resources-data.js +++ b/docs/html/resources/resources-data.js @@ -408,6 +408,16 @@ var ANDROID_RESOURCES = [ } }, { + tags: ['sample', 'new'], + path: 'samples/AndroidBeam/index.html', + title: { + en: 'Android Beam' + }, + description: { + en: 'An example of how to use the Android Beam feature to send messages between two Android-powered devices (API level 14 or later) that support NFC.' + } + }, + { tags: ['sample', 'layout', 'ui'], path: 'samples/ApiDemos/index.html', title: { |