summaryrefslogtreecommitdiffstats
path: root/opengl/java/android/opengl/GLSurfaceView.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2011-10-29 02:16:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-29 02:16:10 +0000
commit74b2b9547329a0b05e0bd5701057696007b854bb (patch)
tree40eea9e4308a3ff3cb5033ddf51a2f25b1872f62 /opengl/java/android/opengl/GLSurfaceView.java
parent76756a42dd68062349158f70d9b0ab95db908acc (diff)
parent09848bc89de999416e2de82a7693b2deec6bf802 (diff)
downloadframeworks_base-74b2b9547329a0b05e0bd5701057696007b854bb.zip
frameworks_base-74b2b9547329a0b05e0bd5701057696007b854bb.tar.gz
frameworks_base-74b2b9547329a0b05e0bd5701057696007b854bb.tar.bz2
am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '09848bc89de999416e2de82a7693b2deec6bf802': docs: add developer guide cross references, Project ACRE, round 3
Diffstat (limited to 'opengl/java/android/opengl/GLSurfaceView.java')
-rw-r--r--opengl/java/android/opengl/GLSurfaceView.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index 0b4f403..8fd866c 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -54,6 +54,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
@@ -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.
* <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