summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2011-10-18 15:02:00 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-18 15:02:00 -0700
commit3f70aa783cca9f4c331c2a1b390bb7bebc6e248c (patch)
tree1ecf4e8520af01315023849c240bcab60b5e58b1
parent6d076a425ab10441996ebe194b0c181d16912ece (diff)
parent6c5c3c392b8abce93fd2d366f12449c713ed0016 (diff)
downloadframeworks_base-3f70aa783cca9f4c331c2a1b390bb7bebc6e248c.zip
frameworks_base-3f70aa783cca9f4c331c2a1b390bb7bebc6e248c.tar.gz
frameworks_base-3f70aa783cca9f4c331c2a1b390bb7bebc6e248c.tar.bz2
Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0
-rw-r--r--core/java/android/hardware/Camera.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index d338764..caad6fd 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -116,6 +116,12 @@ import java.util.StringTokenizer;
* auto-focus capabilities. In order for your application to be compatible with
* more devices, you should not make assumptions about the device camera
* specifications.</p>
+ *
+ * <div class="special reference">
+ * <h3>Developer Guides</h3>
+ * <p>For more information about using cameras, read the
+ * <a href="{@docRoot}guide/topics/media/camera.html">Camera</a> developer guide.</p>
+ * </div>
*/
public class Camera {
private static final String TAG = "Camera";