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

Merge "adding Android Beam sample"

Browse Source
This commit is contained in:
Scott Main
2011-10-04 17:09:38 -07:00
committed by Android (Google) Code Review
parent 53902603a4 d8afdb49ff
commit df5d7c882c
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -400,6 +400,8 @@ web_docs_sample_code_flags := \
resources/samples/AccessibilityService "Accessibility Service" \ resources/samples/AccessibilityService "Accessibility Service" \
-samplecode $(sample_dir)/AccelerometerPlay \ -samplecode $(sample_dir)/AccelerometerPlay \
resources/samples/AccelerometerPlay "Accelerometer Play" \ resources/samples/AccelerometerPlay "Accelerometer Play" \
-samplecode $(sample_dir)/AndroidBeam \
resources/samples/AndroidBeam "Android Beam" \
-samplecode $(sample_dir)/ApiDemos \ -samplecode $(sample_dir)/ApiDemos \
resources/samples/ApiDemos "API Demos" \ resources/samples/ApiDemos "API Demos" \
-samplecode $(sample_dir)/Support4Demos \ -samplecode $(sample_dir)/Support4Demos \

10
docs/html/resources/resources-data.js
View File

@@ -407,6 +407,16 @@ var ANDROID_RESOURCES = [
en: 'Illustrates an accessibility service that provides custom feedback for the Clock application which comes by default with Android devices' en: 'Illustrates an accessibility service that provides custom feedback for the Clock application which comes by default with Android devices'
} }
}, },
{
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'], tags: ['sample', 'layout', 'ui'],
path: 'samples/ApiDemos/index.html', path: 'samples/ApiDemos/index.html',