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

am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1

Browse Source 
* commit '762481f0b58ac41b7583f74315fcb213ca0eb630':
  adding the usb apis to the resources browser
This commit is contained in:
Robert Ly
2011-05-04 13:14:48 -07:00
committed by Android Git Automerger
parent f0a1d683d9 762481f0b5
commit 7c8be3a75d
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

@@ -438,6 +438,8 @@ web_docs_sample_code_flags := \
resources/samples/TicTacToeLib "TicTacToeLib" \ resources/samples/TicTacToeLib "TicTacToeLib" \
-samplecode $(sample_dir)/TicTacToeMain \ -samplecode $(sample_dir)/TicTacToeMain \
resources/samples/TicTacToeMain "TicTacToeMain" \ resources/samples/TicTacToeMain "TicTacToeMain" \
-samplecode $(sample_dir)/USB \
resources/samples/USB "USB" \
-samplecode $(sample_dir)/WeatherListWidget \ -samplecode $(sample_dir)/WeatherListWidget \
resources/samples/WeatherListWidget "Weather List Widget" \ resources/samples/WeatherListWidget "Weather List Widget" \
-samplecode $(sample_dir)/Wiktionary \ -samplecode $(sample_dir)/Wiktionary \

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

@@ -605,6 +605,16 @@ var ANDROID_RESOURCES = [
en: 'Demonstrates how an application can make use of shared code and resources stored in an Android library project.' en: 'Demonstrates how an application can make use of shared code and resources stored in an Android library project.'
} }
}, },
{
tags: ['sample', 'new', 'newfeature'],
path: 'samples/USB/index.html',
title: {
en: 'USB'
},
description: {
en: 'A set of samples that demonstrate how to use various features of the USB APIs.'
}
},
{ {
tags: ['sample', 'ui', 'widgets'], tags: ['sample', 'ui', 'widgets'],
path: 'samples/Wiktionary/index.html', path: 'samples/Wiktionary/index.html',