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

Merge "change android beam sample name" into ics-mr0

Browse Source
This commit is contained in:
Scott Main
2011-10-14 10:29:53 -07:00
committed by Android (Google) Code Review
parent 1a59c7e397 49eb519696
commit 33210ec1f5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@@ -402,8 +402,8 @@ web_docs_sample_code_flags := \
resources/samples/AccelerometerPlay "Accelerometer Play" \ resources/samples/AccelerometerPlay "Accelerometer Play" \
-samplecode $(sample_dir)/ActionBarCompat \ -samplecode $(sample_dir)/ActionBarCompat \
resources/samples/ActionBarCompat "Action Bar Compatibility" \ resources/samples/ActionBarCompat "Action Bar Compatibility" \
-samplecode $(sample_dir)/AndroidBeam \ -samplecode $(sample_dir)/AndroidBeamDemo \
resources/samples/AndroidBeam "Android Beam" \ resources/samples/AndroidBeam "Android Beam Demo" \
-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 \

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

@@ -419,9 +419,9 @@ var ANDROID_RESOURCES = [
}, },
{ {
tags: ['sample', 'new'], tags: ['sample', 'new'],
path: 'samples/AndroidBeam/index.html', path: 'samples/AndroidBeamDemo/index.html',
title: { title: {
en: 'Android Beam' en: 'Android Beam Demo'
}, },
description: { 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.' 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.'