diff options
author | The Android Automerger <android-build@android.com> | 2011-11-02 10:14:18 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2011-11-02 10:14:18 -0700 |
commit | 8e31988d264785f05b97606a09d2d65de0d59904 (patch) | |
tree | d039d43b02c5871f740864998ba705bc51a51941 | |
parent | 5070dd097caa6f935803a933117fe6b3000bda47 (diff) | |
download | base-8e31988d264785f05b97606a09d2d65de0d59904.tar.gz |
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
-rw-r--r-- | core/java/android/hardware/Camera.java | 21 | ||||
-rw-r--r-- | include/camera/CameraParameters.h | 20 |
2 files changed, 18 insertions, 23 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 68f0247600b1..caad6fde9436 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1687,18 +1687,15 @@ public class Camera { * aggressive than {@link #FOCUS_MODE_CONTINUOUS_VIDEO}. Auto focus * starts when the parameter is set. * - * <p>Applications can call {@link #autoFocus(AutoFocusCallback)} in - * this mode. If the autofocus is in the middle of scanning, the focus - * callback will return when it completes. If the autofocus is not - * scanning, the focus callback will immediately return with a boolean - * that indicates whether the focus is sharp or not. The apps can then - * decide if they want to take a picture immediately or to change the - * focus mode to auto, and run a full autofocus cycle. The focus - * position is locked after autoFocus call. If applications want to - * resume the continuous focus, cancelAutoFocus must be called. - * Restarting the preview will not resume the continuous autofocus. To - * stop continuous focus, applications should change the focus mode to - * other modes. + * <p>If applications call {@link #autoFocus(AutoFocusCallback)} in this + * mode, the focus callback will immediately return with a boolean that + * indicates whether the focus is sharp or not. The apps can then decide + * if they want to take a picture immediately or to change the focus + * mode to auto, and run a full autofocus cycle. The focus position is + * locked after autoFocus call. If applications want to resume the + * continuous focus, cancelAutoFocus must be called. Restarting the + * preview will not resume the continuous autofocus. To stop continuous + * focus, applications should change the focus mode to other modes. * * @see #FOCUS_MODE_CONTINUOUS_VIDEO */ diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 7edf6b4562ff..ef4cf5c705fc 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -644,17 +644,15 @@ public: // than FOCUS_MODE_CONTINUOUS_VIDEO. Auto focus starts when the parameter is // set. // - // Applications can call CameraHardwareInterface.autoFocus in this mode. If - // the autofocus is in the middle of scanning, the focus callback will - // return when it completes. If the autofocus is not scanning, focus - // callback will immediately return with a boolean that indicates whether - // the focus is sharp or not. The apps can then decide if they want to take - // a picture immediately or to change the focus mode to auto, and run a full - // autofocus cycle. The focus position is locked after autoFocus call. If - // applications want to resume the continuous focus, cancelAutoFocus must be - // called. Restarting the preview will not resume the continuous autofocus. - // To stop continuous focus, applications should change the focus mode to - // other modes. + // If applications call CameraHardwareInterface.autoFocus in this mode, the + // focus callback will immediately return with a boolean that indicates + // whether the focus is sharp or not. The apps can then decide if they want + // to take a picture immediately or to change the focus mode to auto, and + // run a full autofocus cycle. The focus position is locked after autoFocus + // call. If applications want to resume the continuous focus, + // cancelAutoFocus must be called. Restarting the preview will not resume + // the continuous autofocus. To stop continuous focus, applications should + // change the focus mode to other modes. static const char FOCUS_MODE_CONTINUOUS_PICTURE[]; private: |