diff options
-rw-r--r-- | core/java/android/hardware/Camera.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 9991600..0661fed 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -38,12 +38,12 @@ import android.os.Message; * <p>There is no default constructor for this class. Use {@link #open()} to * get a Camera object.</p> * - * <p>In order to use the device camera, you must declare the - * {@link android.Manifest.permission#CAMERA} permission in your Android + * <p>In order to use the device camera, you must declare the + * {@link android.Manifest.permission#CAMERA} permission in your Android * Manifest. Also be sure to include the * <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a> - * manifest element in order to declare camera features used by your application. - * For example, if you use the camera and auto-focus feature, your Manifest + * manifest element in order to declare camera features used by your application. + * For example, if you use the camera and auto-focus feature, your Manifest * should include the following:</p> * <pre> <uses-permission android:name="android.permission.CAMERA" /> * <uses-feature android:name="android.hardware.camera" /> @@ -52,7 +52,7 @@ import android.os.Message; * <p class="caution"><strong>Caution:</strong> Different Android-powered devices * may have different hardware specifications, such as megapixel ratings and * auto-focus capabilities. In order for your application to be compatible with - * more devices, you should not make assumptions about the device camera + * more devices, you should not make assumptions about the device camera * specifications.</p> */ public class Camera { @@ -197,7 +197,7 @@ public class Camera { * The callback that delivers the preview frames. * * @param data The contents of the preview frame in the format defined - * by {@link android.graphics.PixelFormat}, which can be queried + * by {@link android.graphics.PixelFormat}, which can be queried * with {@link android.hardware.Camera.Parameters#getPreviewFormat()}. * If {@link android.hardware.Camera.Parameters#setPreviewFormat(int)} * is never called, the default will be the YCbCr_420_SP @@ -340,11 +340,11 @@ public class Camera { /** * Handles the callback for the camera auto focus. - * <p>Devices that do not support auto-focus will receive a "fake" - * callback to this interface. If your application needs auto-focus and + * <p>Devices that do not support auto-focus will receive a "fake" + * callback to this interface. If your application needs auto-focus and * should not be installed on devices <em>without</em> auto-focus, you must * declare that your app uses the - * {@code android.hardware.camera.autofocus} feature, in the + * {@code android.hardware.camera.autofocus} feature, in the * <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a> * manifest element.</p> */ @@ -368,11 +368,11 @@ public class Camera { * AutoFocusCallback#onAutoFocus(boolean, Camera)} callback will be called * immediately. * <p>If your application should not be installed - * on devices without auto-focus, you must declare that your application - * uses auto-focus with the + * on devices without auto-focus, you must declare that your application + * uses auto-focus with the * <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a> * manifest element.</p> - * + * * @param cb the callback to run */ public final void autoFocus(AutoFocusCallback cb) @@ -917,11 +917,11 @@ public class Camera { } /** - * Sets the image format for preview pictures. + * Sets the image format for preview pictures. * <p>If this is never called, the default format will be * {@link android.graphics.PixelFormat#YCbCr_420_SP}, which * uses the NV21 encoding format.</p> - * + * * @param pixel_format the desired preview picture format, defined * by one of the {@link android.graphics.PixelFormat} constants. * (E.g., <var>PixelFormat.YCbCr_420_SP</var> (default), @@ -942,8 +942,8 @@ public class Camera { /** * Returns the image format for preview pictures got from * {@link PreviewCallback}. - * - * @return the {@link android.graphics.PixelFormat} int representing + * + * @return the {@link android.graphics.PixelFormat} int representing * the preview picture format. */ public int getPreviewFormat() { |