diff options
| author | Mathias Agopian <mathias@google.com> | 2009-07-01 18:33:18 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-07-01 18:33:18 -0700 |
| commit | dfe983bd7979ccb1602f29b8f9804c98411d9cd6 (patch) | |
| tree | 8a5547078b72cb262e54f0640dd4ed746b5805ef /include/ui | |
| parent | 3a6b160a3b52cd96fb383d5ee93c22e5e938e0e2 (diff) | |
| parent | 7f32b426cd6a865ac5e6e3e9fa833e9327fb415a (diff) | |
| download | frameworks_base-dfe983bd7979ccb1602f29b8f9804c98411d9cd6.zip frameworks_base-dfe983bd7979ccb1602f29b8f9804c98411d9cd6.tar.gz frameworks_base-dfe983bd7979ccb1602f29b8f9804c98411d9cd6.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'include/ui')
| -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, |