summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2011-10-31 12:26:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-31 12:26:31 +0000
commiteba186448ff048f8fc1ba596c9779e8069a93128 (patch)
tree286bec506d8cc6c5e8b6ed4a39543ee4dd63b280 /opengl
parentb0ac8ed48307cf5ee34c38cf56856f15db99c96f (diff)
parent74b2b9547329a0b05e0bd5701057696007b854bb (diff)
downloadframeworks_base-eba186448ff048f8fc1ba596c9779e8069a93128.zip
frameworks_base-eba186448ff048f8fc1ba596c9779e8069a93128.tar.gz
frameworks_base-eba186448ff048f8fc1ba596c9779e8069a93128.tar.bz2
am 74b2b954: am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '74b2b9547329a0b05e0bd5701057696007b854bb': docs: add developer guide cross references, Project ACRE, round 3
Diffstat (limited to 'opengl')
-rw-r--r--opengl/java/android/opengl/GLSurfaceView.java13
-rw-r--r--opengl/java/android/opengl/package.html5
-rw-r--r--opengl/java/javax/microedition/khronos/opengles/package.html8
3 files changed, 25 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index cd41185..3b077ef 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -53,6 +53,12 @@ import android.view.SurfaceView;
* <li>Optionally wraps, traces, and/or error-checks the renderer's OpenGL calls.
* </ul>
*
+ * <div class="special reference">
+ * <h3>Developer Guides</h3>
+ * <p>For more information about how to use OpenGL, read the
+ * <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a> developer guide.</p>
+ * </div>
+ *
* <h3>Using GLSurfaceView</h3>
* <p>
* Typically you use GLSurfaceView by subclassing it and overriding one or more of the
@@ -633,6 +639,13 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
* this interface, and then call {@link GLSurfaceView#setRenderer} to
* register the renderer with the GLSurfaceView.
* <p>
+ *
+ * <div class="special reference">
+ * <h3>Developer Guides</h3>
+ * <p>For more information about how to use OpenGL, read the
+ * <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a> developer guide.</p>
+ * </div>
+ *
* <h3>Threading</h3>
* 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 7175b33..3c57af9 100644
--- a/opengl/java/android/opengl/package.html
+++ b/opengl/java/android/opengl/package.html
@@ -1,5 +1,8 @@
<HTML>
<BODY>
-Provides OpenGL utilities.
+<p>Provides an OpenGL ES static interface and utilities.</p>
+
+<p>For more information about how to use OpenGL, read the
+<a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a> developer guide.</p>
</BODY>
</HTML>
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 0000000..0e3dbee
--- /dev/null
+++ b/opengl/java/javax/microedition/khronos/opengles/package.html
@@ -0,0 +1,8 @@
+<HTML>
+<BODY>
+<p>Provides a standard OpenGL interface.</p>
+
+<p>For more information about how to use OpenGL, read the
+<a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a> developer guide.</p>
+</BODY>
+</HTML> \ No newline at end of file