Skip to content

Commit 6f5b5ee

Browse files
author
Pin Ting
committed
Fix document.
Change-Id: I661b259c8438f9290d57fae29a828cf4495ce335
1 parent e606cb4 commit 6f5b5ee

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

docs/html/guide/topics/media/camera.jd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ use or does not exist will cause your application to be shut down by the system.
442442
the first, back-facing camera on a device with more than one camera.</p>
443443

444444
<h3 id="check-camera-features">Checking camera features</h3>
445-
<p>Once you obtain access to a camera, you can get further information about its capabilties using
445+
<p>Once you obtain access to a camera, you can get further information about its capabilities using
446446
the {@link android.hardware.Camera#getParameters() Camera.getParameters()} method and checking the
447447
returned {@link android.hardware.Camera.Parameters} object for supported capabilities. When using
448448
API Level 9 or higher, use the {@link android.hardware.Camera#getCameraInfo(int,
@@ -677,8 +677,8 @@ button {@link android.view.View.OnClickListener}.</p>
677677
<pre>
678678
// Add a listener to the Capture button
679679
Button captureButton = (Button) findViewById(id.button_capture);
680-
captureButton.setOnClickListener(
681-
new View.OnClickListener() {
680+
captureButton.setOnClickListener(
681+
new View.OnClickListener() {
682682
&#64;Override
683683
public void onClick(View v) {
684684
// get an image from the camera

docs/html/training/camera/cameradirect.jd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ previous.link=videobasics.html
3535
the framework APIs.</p>
3636

3737
<p>Directly controlling a device camera requires a lot more code than requesting pictures or videos
38-
from existing camera applications. However, if you want to build a specialized camera application or
38+
from existing camera applications. However, if you want to build a specialized camera application
3939
or something fully integrated in your app UI, this lesson shows you how.</p>
4040

4141

@@ -95,7 +95,7 @@ camera sensor is picking up.</p>
9595
<p>To get started with displaying a preview, you need preview class. The
9696
preview requires an implementation of the {@code
9797
android.view.SurfaceHolder.Callback} interface, which is used to pass image
98-
data from the camera hardware the application.</p>
98+
data from the camera hardware to the application.</p>
9999

100100
<pre>
101101
class Preview extends ViewGroup implements SurfaceHolder.Callback {
@@ -214,7 +214,7 @@ takePicture()}.</p>
214214

215215
<h2 id="TaskRestartPreview">Restart the Preview</h2>
216216

217-
<p>After a picture is taken, you must to restart the preview before the user
217+
<p>After a picture is taken, you must restart the preview before the user
218218
can take another picture. In this example, the restart is done by overloading
219219
the shutter button.</p>
220220

docs/html/training/camera/videobasics.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public static boolean isIntentAvailable(Context context, String action) {
107107
<p>The Android Camera application returns the video in the {@link android.content.Intent} delivered
108108
to {@link android.app.Activity#onActivityResult onActivityResult()} as a {@link
109109
android.net.Uri} pointing to the video location in storage. The following code
110-
retrieves this image and displays it in a {@link android.widget.VideoView}.</p>
110+
retrieves this video and displays it in a {@link android.widget.VideoView}.</p>
111111

112112
<pre>
113113
private void handleCameraVideo(Intent intent) {

0 commit comments

Comments
 (0)