summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorDave Sparks <davidsparks@android.com>2009-06-26 13:33:32 -0700
committerDave Sparks <davidsparks@android.com>2009-06-26 13:33:32 -0700
commitc62f9bd13327937aa2d2f20b44215397120634c1 (patch)
tree8bb2e7596e82588e9c4517f65209a174f809cc32 /include/ui
parentaae628b44518f0886a7f33b88c1131f47d853e70 (diff)
downloadframeworks_base-c62f9bd13327937aa2d2f20b44215397120634c1.zip
frameworks_base-c62f9bd13327937aa2d2f20b44215397120634c1.tar.gz
frameworks_base-c62f9bd13327937aa2d2f20b44215397120634c1.tar.bz2
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/ui')
-rw-r--r--include/ui/Camera.h10
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,