diff --git a/core/java/android/app/backup/BackupAgent.java b/core/java/android/app/backup/BackupAgent.java
index 9542874902cac..9ad33a5a4105a 100644
--- a/core/java/android/app/backup/BackupAgent.java
+++ b/core/java/android/app/backup/BackupAgent.java
@@ -46,9 +46,15 @@ import libcore.io.StructStat;
* {@link #onBackup(ParcelFileDescriptor, BackupDataOutput, ParcelFileDescriptor) onBackup()}
* and {@link #onRestore(BackupDataInput, int, ParcelFileDescriptor) onRestore()} methods,
* and provide the name of its backup agent class in its {@code AndroidManifest.xml} file via
- * the <application>
+ * the
+ * <application>
* tag's {@code android:backupAgent} attribute.
+ *
+ *
+ *
Developer Guides
+ *
For more information about using BackupAgent, read the
+ * Data Backup developer guide.
+ *
* Basic Operation
*
* When the application makes changes to data that it wishes to keep backed up,
diff --git a/core/java/android/app/backup/BackupAgentHelper.java b/core/java/android/app/backup/BackupAgentHelper.java
index d47ca22c9ef4a..45daead154ce0 100644
--- a/core/java/android/app/backup/BackupAgentHelper.java
+++ b/core/java/android/app/backup/BackupAgentHelper.java
@@ -42,6 +42,12 @@ import java.io.IOException;
* {@link BackupAgentHelper} framework. See the {@link BackupHelper} interface
* documentation for details.
*
+ *
+ *
Developer Guides
+ *
For more information about using BackupAgentHelper, read the
+ * Data Backup developer guide.
+ *
+ *
* @see BackupHelper
* @see FileBackupHelper
* @see SharedPreferencesBackupHelper
diff --git a/core/java/android/app/backup/BackupManager.java b/core/java/android/app/backup/BackupManager.java
index 80656a18de2e7..6eebed23fa2fa 100644
--- a/core/java/android/app/backup/BackupManager.java
+++ b/core/java/android/app/backup/BackupManager.java
@@ -41,10 +41,15 @@ import android.util.Log;
* of how the operation then proceeds.
*
* Several attributes affecting the operation of the backup and restore mechanism
- * can be set on the <application>
+ * can be set on the
+ * <application>
* tag in your application's AndroidManifest.xml file.
*
+ *
+ *
Developer Guides
+ *
For more information about using BackupManager, read the
+ * Data Backup developer guide.
+ *
* @attr ref android.R.styleable#AndroidManifestApplication_allowBackup
* @attr ref android.R.styleable#AndroidManifestApplication_backupAgent
* @attr ref android.R.styleable#AndroidManifestApplication_killAfterRestore
diff --git a/core/java/android/content/SharedPreferences.java b/core/java/android/content/SharedPreferences.java
index 4d9ee540b2c13..bdc38d649a539 100644
--- a/core/java/android/content/SharedPreferences.java
+++ b/core/java/android/content/SharedPreferences.java
@@ -30,6 +30,12 @@ import java.util.Set;
* Note: currently this class does not support use across multiple
* processes. This will be added later.
*
+ *
+ *
Developer Guides
+ *
For more information about using SharedPreferences, read the
+ * Data Storage
+ * developer guide.
+ *
* @see Context#getSharedPreferences
*/
public interface SharedPreferences {
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
index 5d01a0f61a6a7..40df1689100f4 100644
--- a/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@ -38,6 +38,12 @@ import android.view.accessibility.AccessibilityNodeInfo;
*
* See {@link ListView}, {@link GridView}, {@link Spinner} and
* {@link Gallery} for commonly used subclasses of AdapterView.
+ *
+ *
*/
public abstract class AdapterView extends ViewGroup {
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index eefd21ed1984d..e1c73fd8d09bc 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -29,6 +29,12 @@ import javax.microedition.khronos.opengles.GL;
* the draw calls (writing into the bitmap), a drawing primitive (e.g. Rect,
* Path, text, Bitmap), and a paint (to describe the colors and styles for the
* drawing).
+ *
+ *
+ *
Developer Guides
+ *
For more information about how to use Canvas, read the
+ *
+ * Canvas and Drawables developer guide.
*/
public class Canvas {
// assigned in constructors, freed in finalizer
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 0a3deb1d10787..4b9c98fa561a0 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -103,9 +103,15 @@ import java.util.Arrays;
* Scale: a compound drawable with a single child drawable,
* whose overall size is modified based on the current level.
*
- * For information and examples of creating drawable resources (XML or bitmap files that
- * can be loaded in code), see Drawable Resources.
+ *
+ *
+ *
Developer Guides
+ *
For more information about how to use drawables, read the
+ * Canvas and Drawables developer
+ * guide. For information and examples of creating drawable resources (XML or bitmap files that
+ * can be loaded in code), read the
+ * Drawable Resources
+ * document.
*/
public abstract class Drawable {
private static final Rect ZERO_BOUNDS_RECT = new Rect();
diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
index c32a5b6b5b264..bc7e90689cec2 100644
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -31,9 +31,15 @@ import java.io.InputStream;
/**
*
* A resizeable bitmap, with stretchable areas that you define. This type of image
- * is defined in a .png file with a special format, described in
- * Resources.
+ * is defined in a .png file with a special format.
*
+ *
+ *
Developer Guides
+ *
For more information about how to use a NinePatchDrawable, read the
+ *
+ * Canvas and Drawables developer guide. For information about creating a NinePatch image
+ * file using the draw9patch tool, see the
+ * Draw 9-patch tool guide.
*/
public class NinePatchDrawable extends Drawable {
// dithering helps a lot, and is pretty cheap, so default is true
diff --git a/graphics/java/android/graphics/drawable/ShapeDrawable.java b/graphics/java/android/graphics/drawable/ShapeDrawable.java
index 4445b6a8636e9..a3622a23590f4 100644
--- a/graphics/java/android/graphics/drawable/ShapeDrawable.java
+++ b/graphics/java/android/graphics/drawable/ShapeDrawable.java
@@ -34,9 +34,16 @@ import java.io.IOException;
* the ShapeDrawable will default to a
* {@link android.graphics.drawable.shapes.RectShape}.
*
- * It can be defined in an XML file with the <shape> element. For more
- * information, see the guide to Drawable Resources.
+ * This object can be defined in an XML file with the <shape> element.
+ *
+ *
+ *
Developer Guides
+ *
For more information about how to use ShapeDrawable, read the
+ *
+ * Canvas and Drawables document. For more information about defining a ShapeDrawable in
+ * XML, read the
+ * Drawable Resources
+ * document.
*
* @attr ref android.R.styleable#ShapeDrawablePadding_left
* @attr ref android.R.styleable#ShapeDrawablePadding_top
diff --git a/media/java/android/media/JetPlayer.java b/media/java/android/media/JetPlayer.java
index 1570db46f2269..06cda34ace73f 100644
--- a/media/java/android/media/JetPlayer.java
+++ b/media/java/android/media/JetPlayer.java
@@ -52,8 +52,13 @@ import android.util.Log;
* the number of segments left to play in the queue,
* application controller events (CC80-83) to mark points in the MIDI segments.
*
- * 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.
+ *
+ *
+ *
+ *
Developer Guides
+ *
For more information about how to use JetPlayer, read the
+ * JetPlayer developer guide.
*/
public class JetPlayer
{
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index ec1c27a8e3cb2..eb32563d73882 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 Audio and Video
- * for additional help using MediaPlayer.
*
* Topics covered here are:
*
@@ -54,6 +52,12 @@ import java.lang.ref.WeakReference;
* - Register informational and error callbacks
*
*
+ *
+ *
Developer Guides
+ *
For more information about how to use MediaPlayer, read the
+ * Media Playback developer guide.
+ *
+ *
*
* State Diagram
*
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 8f5d0e508651e..7b42ac3c9d126 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).
*
- * See the Audio and Video
- * documentation for additional help with using MediaRecorder.
- *
Note: Currently, MediaRecorder does not work on the emulator.
+ *
Note: Currently, MediaRecorder does not work on the emulator.
+ *
+ *
+ *
Developer Guides
+ *
For more information about how to use MediaRecorder for recording video, read the
+ * Camera developer guide.
+ * For more information about how to use MediaRecorder for recording sound, read the
+ * Audio Capture developer guide.
+ *
*/
public class MediaRecorder
{
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index 4c7f84e4f49a4..51b7c58145fc9 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -54,6 +54,12 @@ import android.view.SurfaceView;
* Optionally wraps, traces, and/or error-checks the renderer's OpenGL calls.
*
*
+ *
+ *
Developer Guides
+ *
For more information about how to use OpenGL, read the
+ * OpenGL developer guide.
+ *
+ *
* Using GLSurfaceView
*
* Typically you use GLSurfaceView by subclassing it and overriding one or more of the
@@ -636,6 +642,13 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
* this interface, and then call {@link GLSurfaceView#setRenderer} to
* register the renderer with the GLSurfaceView.
*
+ *
+ *
+ *
Developer Guides
+ *
For more information about how to use OpenGL, read the
+ * OpenGL developer guide.
+ *
+ *
* Threading
* The renderer will be called on a separate thread, so that rendering
* performance is decoupled from the UI thread. Clients typically need to
diff --git a/opengl/java/android/opengl/package.html b/opengl/java/android/opengl/package.html
index 7175b334c5bb6..3c57af92e2ec3 100644
--- a/opengl/java/android/opengl/package.html
+++ b/opengl/java/android/opengl/package.html
@@ -1,5 +1,8 @@
-Provides OpenGL utilities.
+Provides an OpenGL ES static interface and utilities.
+
+For more information about how to use OpenGL, read the
+OpenGL developer guide.
diff --git a/opengl/java/javax/microedition/khronos/opengles/package.html b/opengl/java/javax/microedition/khronos/opengles/package.html
new file mode 100644
index 0000000000000..0e3dbee565a4b
--- /dev/null
+++ b/opengl/java/javax/microedition/khronos/opengles/package.html
@@ -0,0 +1,8 @@
+
+
+Provides a standard OpenGL interface.
+
+For more information about how to use OpenGL, read the
+OpenGL developer guide.
+
+
\ No newline at end of file