From e926b999ddd1a607e4f01ee2acd79dc87de62688 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Nov 2011 20:53:06 -0700 Subject: [PATCH] merge in ics-factoryrom-2-release history after reset to ics-mr0 --- include/camera/CameraParameters.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index ef4cf5c705..7edf6b4562 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -644,15 +644,17 @@ public: // than FOCUS_MODE_CONTINUOUS_VIDEO. Auto focus starts when the parameter is // set. // - // 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. + // 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. static const char FOCUS_MODE_CONTINUOUS_PICTURE[]; private: -- 2.11.0