Commit Graph

302 Commits

Author SHA1 Message Date
Eino-Ville Talvala
143c7c8854 am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
  Switch camera sounds to always use the system enforced audio stream.
2012-01-06 15:51:44 -08:00
Eino-Ville Talvala
b7feb1c91f Switch camera sounds to always use the system enforced audio stream.
Instead of picking between the music stream and the enforced audio
stream, change the camera service to always play sounds through
enforced system stream. Also update the currently-hidden CameraSound
API to match.

Bug: 5778365
Change-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3
2012-01-06 10:24:01 -08:00
Joe Fernandez
2b07267753 am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '201469f54522436be79d4d6665721049bfc74320':
  docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:59:34 -08:00
Joe Fernandez
3aef8e1d1b docs: Add developer guide cross-references, Project ACRE, round 4
Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
2011-12-22 15:08:23 -08:00
Wu-cheng Li
12f3e28544 Merge "Add a method to get empty camera parameters." 2011-11-30 00:47:01 -08:00
Wu-cheng Li
9d062cfe94 Add camera focus move callback.
bug:5534973
Change-Id: Iaadcb2738ad040f94849be30ee531326f6199431
2011-11-29 14:28:05 +08:00
Wu-cheng Li
1c04a33c04 Add a method to get empty camera parameters.
bug:5656411
Change-Id: I96e1f74c95a7b40bfbf68bdc93d14dad6fd63426
2011-11-22 18:21:18 +08:00
Wu-cheng Li
0cac6aa993 Move Camera.Sound to a stand-alone class CameraSound.
bug:5640219

Change-Id: Ibc105351e25b9758c451a94d9a5e50942bf0e926
2011-11-21 17:57:33 +08:00
Wu-cheng Li
b838d8d4a2 Unlock camera AWB lock only when white-balance is changed.
bug:5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
2011-11-18 15:21:47 +08:00
Wu-cheng Li
8c13670c13 Improve camera face detection javadoc.
bug:4460717
Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
2011-11-15 17:55:37 +08:00
Eino-Ville Talvala
e0cc55ac72 Add a sound-playing method to Camera API.
To allow applications with non-standard Camera use cases to use the
platform sound files and routing, add a method to play any of the
standard Camera sounds (shutter, autofocus, record start/stop) using a
background thread.

Bug: 5447107
Change-Id: I2524853a626e3ce334a7aad2f7de061d5c04abd0
2011-11-10 10:23:49 -08:00
Chih-Chung Chang
11ba6da460 am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
  Update camera continuous autofocus javadoc.
2011-11-01 04:05:45 +00:00
Pannag Sanketi
d47823e359 Expose video stabilization API
Related to bug:5469735

Change-Id: I0a8245b37eed7f2cb58d35c7a9a7b3b293b64694
2011-10-31 14:17:46 -07:00
Wu-cheng Li
0f4f97b70f Update camera continuous autofocus javadoc.
Suppose applications call autoFocus in CAF picture mode. If
CAF is in the middle of scanning, the picture is very likely to
be blurry. Change focus callback to return when the scanning
finishes.

bug:5514415
Change-Id: Ibcb8f92a5263d7dbd7cce54df3617fb21c6255d4
2011-10-28 00:38:02 +08:00
Joe Fernandez
6c5c3c392b docs: Camera JavaDoc - added xref to Camera DevGuide
Change-Id: I4b5faa154a63f0830717a9156b617a0199604547
2011-10-18 14:57:05 -07:00
Wu-cheng Li
53b30912d3 Improve camera javadoc and fix some errors.
bug:5169599
Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
2011-10-13 12:04:05 +08:00
Eino-Ville Talvala
037abb8bb0 Add video stabilization control to Camera parameters.
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.

Convenience accessor methods hidden for now.

Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
2011-10-12 10:34:10 -07:00
Wu-cheng Li
3c02c12c73 Merge "Allow Camera.setDisplayOrientation to be called when preview is active." 2011-10-07 03:08:23 -07:00
Wu-cheng Li
d303362ac2 Allow Camera.setDisplayOrientation to be called when preview is active.
bug:5422679

Change-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb
2011-10-07 18:01:09 +08:00
Joe Fernandez
464cb21e2a docs: Camera class JavaDoc FixIts for ICS
Change-Id: I03d96247d149baf82c53b33aa7737fca11906ce6
2011-10-04 16:56:47 -07:00
Wei Huang
3d9a9e55df Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 2011-09-23 10:04:02 -07:00
Chih-yu Huang
664d72e663 Clear callbacks in camera stopPreview.
Clear those callbacks to remove the references
so the memory can be recycled.

bug:5358774
Change-Id: I3b6034a1891126b3437a6744013f38a64f5bb03b
2011-09-23 20:28:28 +08:00
Wu-cheng Li
b4f95be03e Update camera javadoc about AE and AWB lock.
- Autofocus does not lock AE and AWB.
- stopPreview and takePicture do not clear AE and AWB locks.

bug:5356404

Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
2011-09-22 18:19:02 +08:00
Mathias Agopian
5263767cda Tweak DELAY_UI for 16Hz to 15Hz
this allows us to hit the lower accel rate.

Change-Id: I21944ee82020cf4b80397b87803bc481ddf51931
2011-09-14 18:18:11 -07:00
Mathias Agopian
66bd5e98ec Merge "improve the gyroscope javadoc" 2011-09-07 15:58:39 -07:00
Mathias Agopian
ad7f33a29c improve the gyroscope javadoc
change the sample code to something more useful and more
correct.

Change-Id: Ia81f86a2f409edbb395405ababae307663824cb9
2011-09-07 15:56:03 -07:00
Wu-cheng Li
4c454d82b6 Unhide camera video snapshot supported API.
bug:5187868
Change-Id: Idefde8746012c8ef504f3e3020e3fe1256c60860
2011-09-08 02:32:20 +08:00
Wu-cheng Li
98bb251c8b Add video snapshot camera parameter.
The API is still hidden.

bug:5187868

Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb
2011-09-01 13:37:14 +08:00
Scott Main
9a10bf0386 fix sample code typo
issue 5190961

Change-Id: I15f10bc97b46f0e5f5e31ff5b38d6c3a938ddedf
2011-08-24 19:09:48 -07:00
Wu-cheng Li
a46c372a75 Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public." 2011-08-23 00:05:00 -07:00
Wu-cheng Li
af4f65806e Make camera FOCUS_MODE_CONTINUOUS_PICTURE public.
bug:5086125
Change-Id: I140dd8357adabb167f2f2efee8f5db00ab86705c
2011-08-22 23:21:03 +08:00
Wei Hua
7526a6d923 Merge "Added additional Face attributes." 2011-08-19 17:20:54 -07:00
Wei Hua
d52b308916 Added additional Face attributes.
bug: 5186701
Change-Id: Id08df922b9a79192a81e6e8bd7c0dccad4664b3b
2011-08-19 13:01:51 -07:00
Eino-Ville Talvala
16b67137b8 Make changing white-balance mode always disable AWB lock.
Fixes previously unspecified behavior wrt changing white-balance mode
while AWB is locked.

Change-Id: Ib70597319010cc7e6c88b26cae534ceea4fb46ce
2011-08-18 13:57:49 -07:00
Wu-cheng Li
b9ac75d3df Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.
The API is still hidden.

bug:5086125
Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
2011-08-18 00:15:40 +08:00
Wu-cheng Li
aba367eea4 Merge "Unhide camera face detection API." 2011-08-10 02:55:29 -07:00
Wu-cheng Li
c0c683b334 Unhide camera face detection API.
bug:4460717
Change-Id: I8d72b0ada370acd6267c47deb654bb4bf1cfb538
2011-08-10 08:45:26 +08:00
Wu-cheng Li
08a907149e Merge "Unhide camera recording hint API." 2011-08-09 02:54:07 -07:00
Wu-cheng Li
09f6d67f37 Merge "Add camera bayer image format." 2011-08-04 01:46:56 -07:00
Wu-cheng Li
70fb908504 Add camera bayer image format.
The API are hidden.

bug:5086073

Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
2011-08-04 16:40:28 +08:00
Wu-cheng Li
9c53f1c33a Unhide camera recording hint API.
bug:4266229
Change-Id: Ic9014e521e22a3940b9c2068ce38783f52d2ac31
2011-08-03 23:39:07 +08:00
Mike Lockwood
e51099f110 UsbManager: add getDefaultFunction()
Bug: 5108883

Change-Id: I211f1ee39987da4a5456d86b49b954c564fa3bf4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-02 12:54:49 -04:00
Wu-cheng Li
bb1e275c0e Pass camera frame metadata from camera service to Java.
bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
2011-08-02 15:48:41 +08:00
Wu-cheng Li
25d8fb51da Add camera recording hint parameter.
The API is still hidden.

bug:4266229
Change-Id: I5e4c24e9e2808582aecb55ac4f1d5be3ed7e36a2
2011-08-02 14:27:58 +08:00
Wu-cheng Li
f0d6a48c6a Add frame metadata parameter to camera data_callback.
bug:4460717
Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc
2011-07-29 07:14:38 +08:00
Wu-cheng Li
4c2292efbb Add camera face detection API.
API are still hidden.

bug:4460717
Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
2011-07-27 05:25:35 +08:00
Wu-cheng Li
f55df0e26a Merge "Add camera new picture and new video broadcast intents." 2011-07-19 11:16:20 -07:00
Wu-cheng Li
10e09c69d6 Add camera new picture and new video broadcast intents.
bug:4964321
Change-Id: I42b45cda2e6a30f3bdf6127e2594933f32ecbaeb
2011-07-19 06:19:26 +08:00
Mike Lockwood
875c24b897 UsbManager: document that passing null setCurrentFunction restores default function
Change-Id: I4340b336f3e91b3b8242f2a66c34a7a7f5c3021f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-18 10:54:32 -07:00
Eino-Ville Talvala
83d3352cf7 NEW_API: Add auto-exposure and auto-white balance locking to the Camera.
Unhides the Camera API calls for using the auto-exposure and
auto-white balance locks. Adds documentation about the interaction
between auto-focus and the AE and AWB locks.

Change-Id: I5bf73b9dce1c93e11a17f9d3efb82db1261524c5
2011-07-14 10:05:04 -07:00