diff options
| author | Pannag Sanketi <psanketi@google.com> | 2011-10-31 15:05:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-31 15:05:19 -0700 |
| commit | dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1 (patch) | |
| tree | ed2870698a188ff9293ef2c1c87816dd86cc93ac | |
| parent | 62015f5d0d1104dfc682b3eb3b6c0be4f63b985a (diff) | |
| parent | d47823e359ac346c7a1b9051866a72e8436f82cd (diff) | |
Merge "Expose video stabilization API" into ics-mr1
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 8654f67d4b41..c4dd900aff0a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9366,6 +9366,7 @@ package android.hardware { method public java.util.List<android.hardware.Camera.Size> getSupportedVideoSizes(); method public java.util.List<java.lang.String> getSupportedWhiteBalance(); method public float getVerticalViewAngle(); + method public boolean getVideoStabilization(); method public java.lang.String getWhiteBalance(); method public int getZoom(); method public java.util.List<java.lang.Integer> getZoomRatios(); @@ -9373,6 +9374,7 @@ package android.hardware { method public boolean isAutoWhiteBalanceLockSupported(); method public boolean isSmoothZoomSupported(); method public boolean isVideoSnapshotSupported(); + method public boolean isVideoStabilizationSupported(); method public boolean isZoomSupported(); method public void remove(java.lang.String); method public void removeGpsData(); @@ -9404,6 +9406,7 @@ package android.hardware { method public void setRecordingHint(boolean); method public void setRotation(int); method public void setSceneMode(java.lang.String); + method public void setVideoStabilization(boolean); method public void setWhiteBalance(java.lang.String); method public void setZoom(int); method public void unflatten(java.lang.String); diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index caad6fde9436..93a1b6ccb44b 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -3256,7 +3256,6 @@ public class Camera { * disable video stabilization. * @see #isVideoStabilizationSupported() * @see #getVideoStabilization() - * @hide */ public void setVideoStabilization(boolean toggle) { set(KEY_VIDEO_STABILIZATION, toggle ? TRUE : FALSE); @@ -3269,7 +3268,6 @@ public class Camera { * @return true if video stabilization is enabled * @see #isVideoStabilizationSupported() * @see #setVideoStabilization(boolean) - * @hide */ public boolean getVideoStabilization() { String str = get(KEY_VIDEO_STABILIZATION); @@ -3283,7 +3281,6 @@ public class Camera { * @return true if video stabilization is supported * @see #setVideoStabilization(boolean) * @see #getVideoStabilization() - * @hide */ public boolean isVideoStabilizationSupported() { String str = get(KEY_VIDEO_STABILIZATION_SUPPORTED); |