summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2011-10-26 13:39:11 -0700
committerJoe Fernandez <joefernandez@google.com>2011-10-28 14:23:23 -0700
commit61fd1e8d8c3ccf2d6b7d4af1c19e8f0988d5a1ec (patch)
tree0cc2443b58929c018ac78c1f85047fb9c4b267f2 /media
parenta6d2e6b952d535fec4483d67ea52947e6e3bc629 (diff)
downloadframeworks_base-61fd1e8d8c3ccf2d6b7d4af1c19e8f0988d5a1ec.zip
frameworks_base-61fd1e8d8c3ccf2d6b7d4af1c19e8f0988d5a1ec.tar.gz
frameworks_base-61fd1e8d8c3ccf2d6b7d4af1c19e8f0988d5a1ec.tar.bz2
docs: add developer guide cross references, Project ACRE, round 3
Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/JetPlayer.java9
-rw-r--r--media/java/android/media/MediaPlayer.java8
-rw-r--r--media/java/android/media/MediaRecorder.java12
3 files changed, 22 insertions, 7 deletions
diff --git a/media/java/android/media/JetPlayer.java b/media/java/android/media/JetPlayer.java
index 1570db4..06cda34 100644
--- a/media/java/android/media/JetPlayer.java
+++ b/media/java/android/media/JetPlayer.java
@@ -52,8 +52,13 @@ import android.util.Log;
* <li>the number of segments left to play in the queue,</li>
* <li>application controller events (CC80-83) to mark points in the MIDI segments.</li>
* </ul>
- * Use {@link #getJetPlayer()} to construct a JetPlayer instance. JetPlayer is a singleton class.
- *
+ * Use {@link #getJetPlayer()} to construct a JetPlayer instance. JetPlayer is a singleton class.
+ * </p>
+ *
+ * <div class="special reference">
+ * <h3>Developer Guides</h3>
+ * <p>For more information about how to use JetPlayer, read the
+ * <a href="{@docRoot}guide/topics/media/jetplayer.html">JetPlayer</a> developer guide.</p></div>
*/
public class JetPlayer
{
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index ec1c27a..eb32563 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -43,8 +43,6 @@ import java.lang.ref.WeakReference;
* MediaPlayer class can be used to control playback
* of audio/video files and streams. An example on how to use the methods in
* this class can be found in {@link android.widget.VideoView}.
- * Please see <a href="{@docRoot}guide/topics/media/index.html">Audio and Video</a>
- * for additional help using MediaPlayer.
*
* <p>Topics covered here are:
* <ol>
@@ -54,6 +52,12 @@ import java.lang.ref.WeakReference;
* <li><a href="#Callbacks">Register informational and error callbacks</a>
* </ol>
*
+ * <div class="special reference">
+ * <h3>Developer Guides</h3>
+ * <p>For more information about how to use MediaPlayer, read the
+ * <a href="{@docRoot}guide/topics/media/mediaplayer.html">Media Playback</a> developer guide.</p>
+ * </div>
+ *
* <a name="StateDiagram"></a>
* <h3>State Diagram</h3>
*
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 8f5d0e5..7b42ac3 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -60,9 +60,15 @@ import java.lang.ref.WeakReference;
* applications are required to create MediaRecorder objects on threads with a
* Looper running (the main UI thread by default already has a Looper running).
*
- * <p>See the <a href="{@docRoot}guide/topics/media/index.html">Audio and Video</a>
- * documentation for additional help with using MediaRecorder.
- * <p>Note: Currently, MediaRecorder does not work on the emulator.
+ * <p><strong>Note:</strong> Currently, MediaRecorder does not work on the emulator.
+ *
+ * <div class="special reference">
+ * <h3>Developer Guides</h3>
+ * <p>For more information about how to use MediaRecorder for recording video, read the
+ * <a href="{@docRoot}guide/topics/media/camera.html#capture-video">Camera</a> developer guide.
+ * For more information about how to use MediaRecorder for recording sound, read the
+ * <a href="{@docRoot}guide/topics/media/audio-capture.html">Audio Capture</a> developer guide.</p>
+ * </div>
*/
public class MediaRecorder
{