summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorBruno Oliveira <btco@google.com>2011-06-07 01:23:02 -0400
committerBruno Oliveira <btco@google.com>2011-06-07 01:28:05 -0400
commit9e67587d022675f4b6f62e565b23745c4a550ed9 (patch)
tree365958f1eba6007aba9501ab9a17c55237f089ba /docs
parent95f397adb13aa69b15b53bb089078d4dbdb269f1 (diff)
downloadframeworks_base-9e67587d022675f4b6f62e565b23745c4a550ed9.zip
frameworks_base-9e67587d022675f4b6f62e565b23745c4a550ed9.tar.gz
frameworks_base-9e67587d022675f4b6f62e565b23745c4a550ed9.tar.bz2
Integrating RandomMusicPlayer sample into tree.
This is a cherrypick of CL 112174 (originally written for honeycomb-mr1) into the honeycomb-mr2 branch. Original CL: https://android-git.corp.google.com/g/#change,112174 Patch Set 2: ammending to fix spaces in title (as suggsted by smain@) Change-Id: I1c6e2f4f3585bb65f9f87342445e21f27bed242d
Diffstat (limited to 'docs')
-rw-r--r--docs/html/resources/resources-data.js10
-rw-r--r--docs/html/resources/samples/images/randommusicplayer.pngbin0 -> 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 7751c82..b80b4a4 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -506,6 +506,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
new file mode 100644
index 0000000..e16e067
--- /dev/null
+++ b/docs/html/resources/samples/images/randommusicplayer.png
Binary files differ