diff options
| author | Bruno Oliveira <btco@google.com> | 2011-06-23 07:47:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-23 07:47:39 -0700 |
| commit | 3987ea15577aecdb068a22bbdc75fb95c8bfbc14 (patch) | |
| tree | afcc960be2dedae2c28d8a7f51f59da58e922eb7 /docs/html/resources/resources-data.js | |
| parent | cf828c41eb704669b15a6c72035aaa5780a5b1d9 (diff) | |
| parent | a62f707da28226d5c6d160d1f0e21a65dcfba5fc (diff) | |
| download | frameworks_base-3987ea15577aecdb068a22bbdc75fb95c8bfbc14.zip frameworks_base-3987ea15577aecdb068a22bbdc75fb95c8bfbc14.tar.gz frameworks_base-3987ea15577aecdb068a22bbdc75fb95c8bfbc14.tar.bz2 | |
am a62f707d: am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
* commit 'a62f707da28226d5c6d160d1f0e21a65dcfba5fc':
Integrating RandomMusicPlayer sample into tree.
Diffstat (limited to 'docs/html/resources/resources-data.js')
| -rw-r--r-- | docs/html/resources/resources-data.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js index 097d004..e8c9ae7 100644 --- a/docs/html/resources/resources-data.js +++ b/docs/html/resources/resources-data.js @@ -547,6 +547,16 @@ var ANDROID_RESOURCES = [ } }, { + tags: ['sample', 'new', 'media' ], + path: 'samples/RandomMusicPlayer/index.html', + title: { + en: 'Random Music Player' + }, + description: { + en: 'Demonstrates how to write a multimedia application that plays music from the device and from URLs. It manages media playback from a service and can play music in the background, respecting audio focus changes.' + } + }, + { tags: ['sample', 'new', 'newfeature', 'performance', 'gamedev', 'gl'], path: 'samples/RenderScript/index.html', title: { |