diff options
author | Alexander Lucas <alexlucas@google.com> | 2011-01-19 18:37:06 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-19 18:37:06 -0800 |
commit | d3782640515019cf4b6f3577cd7917cb0ef4b68e (patch) | |
tree | 77ef6466ca30011eddbd2d4bec176b973d3be2aa | |
parent | 3b6731b32dae652700a6908f5d838b62d39c0962 (diff) | |
parent | af3227ff772e8d5d577fd6fa10338837b435e99f (diff) | |
download | frameworks_base-d3782640515019cf4b6f3577cd7917cb0ef4b68e.zip frameworks_base-d3782640515019cf4b6f3577cd7917cb0ef4b68e.tar.gz frameworks_base-d3782640515019cf4b6f3577cd7917cb0ef4b68e.tar.bz2 |
am af3227ff: Merge "Added Honeycomb-Gallery to docs." into honeycomb
* commit 'af3227ff772e8d5d577fd6fa10338837b435e99f':
Added Honeycomb-Gallery to docs.
-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 |