diff options
author | Chih-Chung Chang <chihchung@google.com> | 2009-09-15 14:51:56 +0800 |
---|---|---|
committer | Chih-Chung Chang <chihchung@google.com> | 2009-09-15 18:29:03 +0800 |
commit | 00900eb35473530a5fc77f7bd3ac306b6dcf19cb (patch) | |
tree | 50ef4d7f5da62be60d0748dba6ed6713c61d6443 /include | |
parent | f5733b2938151fda955f01d9dc3ad15f7292604d (diff) | |
download | frameworks_native-00900eb35473530a5fc77f7bd3ac306b6dcf19cb.zip frameworks_native-00900eb35473530a5fc77f7bd3ac306b6dcf19cb.tar.gz frameworks_native-00900eb35473530a5fc77f7bd3ac306b6dcf19cb.tar.bz2 |
Fix 2083478: Camera needs an auto-focus cancel API
Change-Id: I13bda991b32aee47e82b5cf9d43b3021c416a9a2
Diffstat (limited to 'include')
-rw-r--r-- | include/ui/Camera.h | 3 | ||||
-rw-r--r-- | include/ui/CameraHardwareInterface.h | 8 | ||||
-rw-r--r-- | include/ui/ICamera.h | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index ae6e255..9ceb8fd 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -143,6 +143,9 @@ public: // autoFocus - status returned from callback status_t autoFocus(); + // cancel auto focus + status_t cancelAutoFocus(); + // take a picture - picture returned from callback status_t takePicture(); diff --git a/include/ui/CameraHardwareInterface.h b/include/ui/CameraHardwareInterface.h index 535f70e..5fbb7d8 100644 --- a/include/ui/CameraHardwareInterface.h +++ b/include/ui/CameraHardwareInterface.h @@ -161,6 +161,14 @@ public: virtual status_t autoFocus() = 0; /** + * Cancels auto-focus function. If the auto-focus is still in progress, + * this function will cancel it. Whether the auto-focus is in progress + * or not, this function will return the focus position to the default. + * If the camera does not support auto-focus, this is a no-op. + */ + virtual status_t cancelAutoFocus() = 0; + + /** * Take a picture. */ virtual status_t takePicture() = 0; diff --git a/include/ui/ICamera.h b/include/ui/ICamera.h index 1df7914..7595e36 100644 --- a/include/ui/ICamera.h +++ b/include/ui/ICamera.h @@ -76,6 +76,9 @@ public: // auto focus virtual status_t autoFocus() = 0; + // cancel auto focus + virtual status_t cancelAutoFocus() = 0; + // take a picture virtual status_t takePicture() = 0; |