diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-26 14:02:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-26 14:02:10 -0700 |
| commit | 17a80081a42410f541a220ab7e6afc64fc6cc399 (patch) | |
| tree | a4fe51dcf8e8caddc7cba9ebbc2c98606cf44950 /include | |
| parent | 72eb0acad5cffc57ce5006f6deab29ee259e461e (diff) | |
| parent | c62f9bd13327937aa2d2f20b44215397120634c1 (diff) | |
| download | frameworks_base-17a80081a42410f541a220ab7e6afc64fc6cc399.zip frameworks_base-17a80081a42410f541a220ab7e6afc64fc6cc399.tar.gz frameworks_base-17a80081a42410f541a220ab7e6afc64fc6cc399.tar.bz2 | |
Merge change 5544 into donut
* changes:
Pipe all the camera callbacks to Java to facilitate the addition of new features. This will make it easy to add things like zoom callbacks without modifying the entire camera stack. Bug 1837832.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/Camera.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index bbc21c4..97e0e90 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -63,16 +63,12 @@ namespace android { #define FRAME_CALLBACK_FLAG_CAMERA 0x05 #define FRAME_CALLBACK_FLAG_BARCODE_SCANNER 0x07 -// msgType in notifyCallback function +// msgType in notifyCallback and dataCallback functions enum { - CAMERA_MSG_ERROR, + CAMERA_MSG_ERROR = 0, CAMERA_MSG_SHUTTER, CAMERA_MSG_FOCUS, - CAMERA_MSG_ZOOM -}; - -// msgType in dataCallback function -enum { + CAMERA_MSG_ZOOM, CAMERA_MSG_PREVIEW_FRAME, CAMERA_MSG_VIDEO_FRAME, CAMERA_MSG_POSTVIEW_FRAME, |