diff options
Diffstat (limited to 'docs/html/training/camera')
| -rw-r--r-- | docs/html/training/camera/cameradirect.jd | 6 | ||||
| -rw-r--r-- | docs/html/training/camera/photobasics.jd | 4 | ||||
| -rw-r--r-- | docs/html/training/camera/videobasics.jd | 4 |
3 files changed, 7 insertions, 7 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> diff --git a/docs/html/training/camera/photobasics.jd b/docs/html/training/camera/photobasics.jd index e6ab43e..3420918 100644 --- a/docs/html/training/camera/photobasics.jd +++ b/docs/html/training/camera/photobasics.jd @@ -55,7 +55,7 @@ for you.</p> <h2 id="TaskManifest">Request Camera Permission</h2> <p>If an essential function of your application is taking pictures, then restrict -its visibility in Android Market to devices that have a camera. To advertise +its visibility on Google Play to devices that have a camera. To advertise that your application depends on having a camera, put a <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"> {@code <uses-feature>}</a> tag in your manifest file:</p> @@ -68,7 +68,7 @@ href="{@docRoot}guide/topics/manifest/uses-feature-element.html"> {@code </pre> <p>If your application uses, but does not require a camera in order to function, add {@code -android:required="false"} to the tag. In doing so, Android Market will allow devices without a +android:required="false"} to the tag. In doing so, Google Play will allow devices without a camera to download your application. It's then your responsibility to check for the availability of the camera at runtime by calling {@link android.content.pm.PackageManager#hasSystemFeature hasSystemFeature(PackageManager.FEATURE_CAMERA)}. diff --git a/docs/html/training/camera/videobasics.jd b/docs/html/training/camera/videobasics.jd index a3512b0..5fe1a3a 100644 --- a/docs/html/training/camera/videobasics.jd +++ b/docs/html/training/camera/videobasics.jd @@ -62,7 +62,7 @@ records video. In this lesson, you make it do this for you.</p> </pre> <p>If your application uses, but does not require a camera in order to function, add {@code -android:required="false"} to the tag. In doing so, Android Market will allow devices without a +android:required="false"} to the tag. In doing so, Google Play will allow devices without a camera to download your application. It's then your responsibility to check for the availability of the camera at runtime by calling {@link android.content.pm.PackageManager#hasSystemFeature hasSystemFeature(PackageManager.FEATURE_CAMERA)}. @@ -107,7 +107,7 @@ public static boolean isIntentAvailable(Context context, String action) { <p>The Android Camera application returns the video in the {@link android.content.Intent} delivered to {@link android.app.Activity#onActivityResult onActivityResult()} as a {@link android.net.Uri} pointing to the video location in storage. The following code -retrieves this image and displays it in a {@link android.widget.VideoView}.</p> +retrieves this video and displays it in a {@link android.widget.VideoView}.</p> <pre> private void handleCameraVideo(Intent intent) { |