diff options
author | Alexander Lucas <alexlucas@google.com> | 2011-01-19 18:33:43 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 18:33:43 -0800 |
commit | af3227ff772e8d5d577fd6fa10338837b435e99f (patch) | |
tree | 854169ff662d8280d4ae9df58c1fc2304950bad5 | |
parent | baf9af94a679f7e4b2273bce6c8f4645ef68015a (diff) | |
parent | d84725401d7b79b79020793d06427cad43fa95b1 (diff) | |
download | frameworks_base-af3227ff772e8d5d577fd6fa10338837b435e99f.zip frameworks_base-af3227ff772e8d5d577fd6fa10338837b435e99f.tar.gz frameworks_base-af3227ff772e8d5d577fd6fa10338837b435e99f.tar.bz2 |
Merge "Added Honeycomb-Gallery to docs." into honeycomb
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | docs/html/resources/resources-data.js | 10 | ||||
-rw-r--r-- | docs/html/resources/samples/images/hcgallery.png | bin | 0 -> 307725 bytes |
3 files changed, 12 insertions, 0 deletions
@@ -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 Binary files differnew file mode 100644 index 0000000..9a80fd7 --- /dev/null +++ b/docs/html/resources/samples/images/hcgallery.png |