summaryrefslogtreecommitdiffstats
path: root/docs/html/training/camera/cameradirect.jd
diff options
context:
space:
mode:
authorPin Ting <pinting@google.com>2012-03-03 00:13:32 +0800
committerPin Ting <pinting@google.com>2012-03-06 16:34:21 +0800
commit6f5b5ee3212c194cd20750af7adb90f938bc8fcd (patch)
treeb3cb399c11ff1df868248c7a8b9e45df1099743a /docs/html/training/camera/cameradirect.jd
parente606cb460272cd99bac05b4477a5e489827b368b (diff)
downloadframeworks_base-6f5b5ee3212c194cd20750af7adb90f938bc8fcd.zip
frameworks_base-6f5b5ee3212c194cd20750af7adb90f938bc8fcd.tar.gz
frameworks_base-6f5b5ee3212c194cd20750af7adb90f938bc8fcd.tar.bz2
Fix document.
Change-Id: I661b259c8438f9290d57fae29a828cf4495ce335
Diffstat (limited to 'docs/html/training/camera/cameradirect.jd')
-rw-r--r--docs/html/training/camera/cameradirect.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/training/camera/cameradirect.jd b/docs/html/training/camera/cameradirect.jd
index 03ad119..4b6f0d2 100644
--- a/docs/html/training/camera/cameradirect.jd
+++ b/docs/html/training/camera/cameradirect.jd
@@ -35,7 +35,7 @@ previous.link=videobasics.html
the framework APIs.</p>
<p>Directly controlling a device camera requires a lot more code than requesting pictures or videos
-from existing camera applications. However, if you want to build a specialized camera application or
+from existing camera applications. However, if you want to build a specialized camera application
or something fully integrated in your app UI, this lesson shows you how.</p>
@@ -95,7 +95,7 @@ camera sensor is picking up.</p>
<p>To get started with displaying a preview, you need preview class. The
preview requires an implementation of the {@code
android.view.SurfaceHolder.Callback} interface, which is used to pass image
-data from the camera hardware the application.</p>
+data from the camera hardware to the application.</p>
<pre>
class Preview extends ViewGroup implements SurfaceHolder.Callback {
@@ -214,7 +214,7 @@ takePicture()}.</p>
<h2 id="TaskRestartPreview">Restart the Preview</h2>
-<p>After a picture is taken, you must to restart the preview before the user
+<p>After a picture is taken, you must restart the preview before the user
can take another picture. In this example, the restart is done by overloading
the shutter button.</p>