diff options
| author | Bruno Oliveira <btco@google.com> | 2011-06-21 11:07:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-21 11:07:47 -0700 |
| commit | da61eab862dabe00f95c784a01c019e4f7776b23 (patch) | |
| tree | 04cf4ee1f9566f78745bdd4a3c23d4cd8fb6d6b9 /docs | |
| parent | 04295266b03f3c588b8be6b6be409d59f757b27b (diff) | |
| parent | 9e67587d022675f4b6f62e565b23745c4a550ed9 (diff) | |
| download | frameworks_base-da61eab862dabe00f95c784a01c019e4f7776b23.zip frameworks_base-da61eab862dabe00f95c784a01c019e4f7776b23.tar.gz frameworks_base-da61eab862dabe00f95c784a01c019e4f7776b23.tar.bz2 | |
Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/resources/resources-data.js | 10 | ||||
| -rw-r--r-- | docs/html/resources/samples/images/randommusicplayer.png | bin | 0 -> 18502 bytes |
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js index 683b062..05dcf55 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: { diff --git a/docs/html/resources/samples/images/randommusicplayer.png b/docs/html/resources/samples/images/randommusicplayer.png Binary files differnew file mode 100644 index 0000000..e16e067 --- /dev/null +++ b/docs/html/resources/samples/images/randommusicplayer.png |
