summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-02-28 23:19:55 -0800
committerWu-cheng Li <wuchengli@google.com>2010-03-01 15:32:33 -0800
commit8cbb8f5e1f939b03515cb4d5942c3fcb226efb9e (patch)
tree82706f029d7d318cb034993cc19625f47ce28903 /include
parent7714d7132e4059a1256581b3599a5808b6a6f294 (diff)
downloadframeworks_base-8cbb8f5e1f939b03515cb4d5942c3fcb226efb9e.zip
frameworks_base-8cbb8f5e1f939b03515cb4d5942c3fcb226efb9e.tar.gz
frameworks_base-8cbb8f5e1f939b03515cb4d5942c3fcb226efb9e.tar.bz2
Unhide zoom API.
bug:2458926
Diffstat (limited to 'include')
-rw-r--r--include/camera/CameraParameters.h24
1 files changed, 23 insertions, 1 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 9df2695..752afc2 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -201,7 +201,29 @@ public:
// 0.3333, EV is -2.
// Example value: "0.333333333" or "0.5". Read only.
static const char KEY_EXPOSURE_COMPENSATION_STEP[];
-
+ // Current zoom value.
+ // Example value: "0" or "6". Read/write.
+ static const char KEY_ZOOM[];
+ // Maximum zoom value.
+ // Example value: "6". Read only.
+ static const char KEY_MAX_ZOOM[];
+ // The zoom ratios of all zoom values. The zoom ratio is in 1/100
+ // increments. Ex: a zoom of 3.2x is returned as 320. The number of list
+ // elements is KEY_MAX_ZOOM + 1. The first element is always 100. The last
+ // element is the zoom ratio of zoom value KEY_MAX_ZOOM.
+ // Example value: "100,150,200,250,300,350,400". Read only.
+ static const char KEY_ZOOM_RATIOS[];
+ // Whether zoom is supported. Zoom is supported if the value is "true". Zoom
+ // is not supported if the value is not "true" or the key does not exist.
+ // Example value: "true". Read only.
+ static const char KEY_ZOOM_SUPPORTED[];
+ // Whether if smooth zoom is supported. Smooth zoom is supported if the
+ // value is "true". It is not supported if the value is not "true" or the
+ // key does not exist.
+ // See CAMERA_CMD_START_SMOOTH_ZOOM, CAMERA_CMD_STOP_SMOOTH_ZOOM, and
+ // CAMERA_MSG_ZOOM in frameworks/base/include/camera/Camera.h.
+ // Example value: "true". Read only.
+ static const char KEY_SMOOTH_ZOOM_SUPPORTED[];
// Values for white balance settings.
static const char WHITE_BALANCE_AUTO[];