summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Lucas <alexlucas@google.com>2011-01-19 18:40:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-19 18:40:00 -0800
commitcd5256594b75e81bcc0708d7599fe5fa0157d0ae (patch)
tree412556874f35255879e727843123272b472ad5f3
parent61414ee9b51a45866520d8d46aae861f4588fc2b (diff)
parentd3782640515019cf4b6f3577cd7917cb0ef4b68e (diff)
downloadframeworks_base-cd5256594b75e81bcc0708d7599fe5fa0157d0ae.zip
frameworks_base-cd5256594b75e81bcc0708d7599fe5fa0157d0ae.tar.gz
frameworks_base-cd5256594b75e81bcc0708d7599fe5fa0157d0ae.tar.bz2
am d3782640: am af3227ff: Merge "Added Honeycomb-Gallery to docs." into honeycomb
* commit 'd3782640515019cf4b6f3577cd7917cb0ef4b68e': Added Honeycomb-Gallery to docs.
-rw-r--r--Android.mk2
-rw-r--r--docs/html/resources/resources-data.js10
-rw-r--r--docs/html/resources/samples/images/hcgallery.pngbin0 -> 307725 bytes
3 files changed, 12 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 5d989d1..61d74ad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -400,6 +400,8 @@ web_docs_sample_code_flags := \
resources/samples/CubeLiveWallpaper "Live Wallpaper" \
-samplecode $(sample_dir)/Home \
resources/samples/Home "Home" \
+ -samplecode $(sample_dir)/Honeycomb-Gallery \
+ resources/samples/Honeycomb-Gallery "Honeycomb Gallery" \
-samplecode $(sample_dir)/JetBoy \
resources/samples/JetBoy "JetBoy" \
-samplecode $(sample_dir)/LunarLander \
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 221406c..233838b 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -405,6 +405,16 @@ var ANDROID_RESOURCES = [
}
},
{
+ tags: ['sample', 'new'],
+ path: 'samples/Honeycomb-Gallery/index.html',
+ title: {
+ en: 'Honeycomb Gallery'
+ },
+ description: {
+ en: 'An image gallery application using Honeycomb-specific APIs.'
+ }
+ },
+ {
tags: ['sample', 'gamedev', 'media'],
path: 'samples/JetBoy/index.html',
title: {
diff --git a/docs/html/resources/samples/images/hcgallery.png b/docs/html/resources/samples/images/hcgallery.png
new file mode 100644
index 0000000..9a80fd7
--- /dev/null
+++ b/docs/html/resources/samples/images/hcgallery.png
Binary files differ