summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2011-05-04 13:10:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-04 13:10:54 -0700
commit762481f0b58ac41b7583f74315fcb213ca0eb630 (patch)
tree82573f4d9bf60b8484b7914ad622f6c2e827fb86
parentfd7974f531b8784e7d229d31dda228cca0e7c2d8 (diff)
parent8cdb2e2d834fc1dbff8d02124a08c0f426aa1de7 (diff)
downloadframeworks_base-762481f0b58ac41b7583f74315fcb213ca0eb630.zip
frameworks_base-762481f0b58ac41b7583f74315fcb213ca0eb630.tar.gz
frameworks_base-762481f0b58ac41b7583f74315fcb213ca0eb630.tar.bz2
Merge "adding the usb apis to the resources browser" into honeycomb-mr1
-rw-r--r--Android.mk2
-rw-r--r--docs/html/resources/resources-data.js10
2 files changed, 12 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index b266061..ae03d6c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -438,6 +438,8 @@ web_docs_sample_code_flags := \
resources/samples/TicTacToeLib "TicTacToeLib" \
-samplecode $(sample_dir)/TicTacToeMain \
resources/samples/TicTacToeMain "TicTacToeMain" \
+ -samplecode $(sample_dir)/USB \
+ resources/samples/USB "USB" \
-samplecode $(sample_dir)/WeatherListWidget \
resources/samples/WeatherListWidget "Weather List Widget" \
-samplecode $(sample_dir)/Wiktionary \
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 14118bb..03a5c02 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -606,6 +606,16 @@ var ANDROID_RESOURCES = [
}
},
{
+ 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'],
path: 'samples/Wiktionary/index.html',
title: {