Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public."

Browse Source
This commit is contained in:
Wu-cheng Li
2011-08-23 00:05:00 -07:00
committed by Android (Google) Code Review
parent 7f76a3cf66 af4f65806e
commit a46c372a75
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -9365,6 +9365,7 @@ package android.hardware {
field public static final int FOCUS_DISTANCE_NEAR_INDEX = 0; // 0x0 field public static final int FOCUS_DISTANCE_NEAR_INDEX = 0; // 0x0
field public static final int FOCUS_DISTANCE_OPTIMAL_INDEX = 1; // 0x1 field public static final int FOCUS_DISTANCE_OPTIMAL_INDEX = 1; // 0x1
field public static final java.lang.String FOCUS_MODE_AUTO = "auto"; field public static final java.lang.String FOCUS_MODE_AUTO = "auto";
field public static final java.lang.String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture";
field public static final java.lang.String FOCUS_MODE_CONTINUOUS_VIDEO = "continuous-video"; field public static final java.lang.String FOCUS_MODE_CONTINUOUS_VIDEO = "continuous-video";
field public static final java.lang.String FOCUS_MODE_EDOF = "edof"; field public static final java.lang.String FOCUS_MODE_EDOF = "edof";
field public static final java.lang.String FOCUS_MODE_FIXED = "fixed"; field public static final java.lang.String FOCUS_MODE_FIXED = "fixed";

1
core/java/android/hardware/Camera.java
View File

@@ -1674,7 +1674,6 @@ public class Camera {
* the focus mode to other modes. * the focus mode to other modes.
* *
* @see #FOCUS_MODE_CONTINUOUS_VIDEO * @see #FOCUS_MODE_CONTINUOUS_VIDEO
* @hide
*/ */
public static final String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture"; public static final String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture";