diff options
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/topics/media/camera.jd | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd index 56ef624..8b79b23 100644 --- a/docs/html/guide/topics/media/camera.jd +++ b/docs/html/guide/topics/media/camera.jd @@ -86,14 +86,17 @@ see how to implement these options.</li> <h2 id="basics">The Basics</h2> <p>The Android framework supports capturing images and video through the -{@link android.hardware.Camera} API or camera {@link android.content.Intent}. Here are the relevant +{@link android.hardware.camera2} API or camera {@link android.content.Intent}. Here are the relevant classes:</p> <dl> - <dt>{@link android.hardware.Camera}</dt> - <dd>This class is the primary API for controlling device cameras. This class is used to take + <dt>{@link android.hardware.camera2}</dt> + <dd>This package is the primary API for controlling device cameras. It can be used to take pictures or videos when you are building a camera application.</dd> + <dt>{@link android.hardware.Camera}</dt> + <dd>This class is the older deprecated API for controlling device cameras.</dd> + <dt>{@link android.view.SurfaceView}</dt> <dd>This class is used to present a live camera preview to the user.</dd> @@ -354,6 +357,10 @@ application or provides special features. Creating a customized camera activity code than <a href="#intents">using an intent</a>, but it can provide a more compelling experience for your users.</p> +<p><strong> Note: The following guide is for the older, deprecated {@link android.hardware.Camera} +API. For new or advanced camera applications, the newer {@link android.hardware.camera2} API is +recommended.</strong></p> + <p>The general steps for creating a custom camera interface for your application are as follows:</p> <ul> |