diff options
| author | 2011-08-23 00:05:00 -0700 | |
|---|---|---|
| committer | 2011-08-23 00:05:00 -0700 | |
| commit | a46c372a75972dbfe73b1813d69fa047c3454b83 (patch) | |
| tree | 685c0f0beb58bea6f3d2b8cf2386236742e32e1e | |
| parent | 7f76a3cf667b95caccb3e6d3f5cf160180717340 (diff) | |
| parent | af4f65806e183cc9523b232200031dfe39c2cd3e (diff) | |
Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index ef3d5b519751..fb16830b8f64 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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_OPTIMAL_INDEX = 1; // 0x1 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_EDOF = "edof"; field public static final java.lang.String FOCUS_MODE_FIXED = "fixed"; diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 08bb133b9eb2..a41a330bb493 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1674,7 +1674,6 @@ public class Camera { * the focus mode to other modes. * * @see #FOCUS_MODE_CONTINUOUS_VIDEO - * @hide */ public static final String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture"; |