Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a62f707d authored by Bruno Oliveira's avatar Bruno Oliveira Committed by Android Git Automerger
Browse files

am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer sample into... 

am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2

* commit 'f1c71771':
  Integrating RandomMusicPlayer sample into tree.
parents 69ff6a47 f1c71771

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -423,6 +423,8 @@ web_docs_sample_code_flags := \ 
		            resources/samples/NotePad "Note Pad" \

		-samplecode $(sample_dir)/SampleSyncAdapter \

		            resources/samples/SampleSyncAdapter "Sample Sync Adapter" \

		-samplecode $(sample_dir)/RandomMusicPlayer \

		            resources/samples/RandomMusicPlayer "Random Music Player" \

		-samplecode $(sample_dir)/RenderScript \

		            resources/samples/RenderScript "RenderScript" \

		-samplecode $(sample_dir)/SearchableDictionary \

docs/html/resources/resources-data.js

+10 −0
Original line number Diff line number Diff line
@@ -546,6 +546,16 @@ var ANDROID_RESOURCES = [ 
      en: 'An application for saving notes. Similar (but not identical) to the <a href="/resources/tutorials/notepad/index.html">Notepad tutorial</a>.'

    }

  },

  {

    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',

docs/html/resources/samples/images/randommusicplayer.png

0 → 100644
+18.1 KiB
Loading image diff...