summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/media
diff options
context:
space:
mode:
authorPin Ting <pinting@google.com>2012-03-06 00:55:49 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-06 00:55:49 -0800
commit25c66c3a4a51617099e848a9376313c90a1ec9ae (patch)
tree5a507beb30f3f8261ff737ba62d022965d2c963d /docs/html/guide/topics/media
parent1c2473042236dd63774d7a2c5edfd991b4ef1b3e (diff)
parent6f5b5ee3212c194cd20750af7adb90f938bc8fcd (diff)
downloadframeworks_base-25c66c3a4a51617099e848a9376313c90a1ec9ae.zip
frameworks_base-25c66c3a4a51617099e848a9376313c90a1ec9ae.tar.gz
frameworks_base-25c66c3a4a51617099e848a9376313c90a1ec9ae.tar.bz2
Merge "Fix document." into ics-mr1
Diffstat (limited to 'docs/html/guide/topics/media')
-rw-r--r--docs/html/guide/topics/media/camera.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd
index a76c3c7..7d72491 100644
--- a/docs/html/guide/topics/media/camera.jd
+++ b/docs/html/guide/topics/media/camera.jd
@@ -442,7 +442,7 @@ use or does not exist will cause your application to be shut down by the system.
the first, back-facing camera on a device with more than one camera.</p>
<h3 id="check-camera-features">Checking camera features</h3>
-<p>Once you obtain access to a camera, you can get further information about its capabilties using
+<p>Once you obtain access to a camera, you can get further information about its capabilities using
the {@link android.hardware.Camera#getParameters() Camera.getParameters()} method and checking the
returned {@link android.hardware.Camera.Parameters} object for supported capabilities. When using
API Level 9 or higher, use the {@link android.hardware.Camera#getCameraInfo(int,
@@ -677,8 +677,8 @@ button {@link android.view.View.OnClickListener}.</p>
<pre>
// Add a listener to the Capture button
Button captureButton = (Button) findViewById(id.button_capture);
- captureButton.setOnClickListener(
- new View.OnClickListener() {
+captureButton.setOnClickListener(
+ new View.OnClickListener() {
&#64;Override
public void onClick(View v) {
// get an image from the camera