summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | am 06b23bb5: Merge "Camera2: Update for camera2 API changes" into lmp-devEino-Ville Talvala2014-09-105-9/+9
|\ \ \ | | |/ | |/|
| * | Merge "Camera2: Update for camera2 API changes" into lmp-devEino-Ville Talvala2014-09-095-9/+9
| |\ \
| | * | Camera2: Update for camera2 API changesEino-Ville Talvala2014-09-085-9/+9
* | | | am 9f57c438: Merge "portability: Fix a bug where long AF callbacks caused ISE...Rachad Alao2014-09-105-8/+144
|\| | |
| * | | Merge "portability: Fix a bug where long AF callbacks caused ISE timeouts" in...Rachad Alao2014-09-095-8/+144
| |\ \ \
| | * | | portability: Fix a bug where long AF callbacks caused ISE timeoutsIgor Murashkin2014-09-095-8/+144
* | | | | am 25ee73ac: Let CameraProxy support setJpegOrientation.Senpo Hu2014-09-094-2/+29
|\| | | |
| * | | | Let CameraProxy support setJpegOrientation.Senpo Hu2014-09-094-2/+29
* | | | | am ca507f86: Merge "Log null returns from Camera.getParameters" into lmp-devAlan Newberger2014-09-091-3/+6
|\| | | |
| * | | | Merge "Log null returns from Camera.getParameters" into lmp-devAlan Newberger2014-09-091-3/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Log null returns from Camera.getParametersAlan Newberger2014-08-201-3/+6
* | | | | am d5205c26: Merge "portability: Fix incorrect comparison between int and Int...Igor Murashkin2014-09-051-1/+1
|\| | | |
| * | | | Merge "portability: Fix incorrect comparison between int and Integer" into lm...Igor Murashkin2014-09-051-1/+1
| |\ \ \ \
| | * | | | portability: Fix incorrect comparison between int and IntegerIgor Murashkin2014-09-051-1/+1
* | | | | | am bb013aa3: Camera2: Renames for API consistencyEino-Ville Talvala2014-09-0511-89/+90
|\| | | | |
| * | | | | Camera2: Renames for API consistencyEino-Ville Talvala2014-09-0511-89/+90
* | | | | | am 3b7da912: ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2014-09-041-3/+9
|\| | | | |
| * | | | | ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2014-09-031-3/+9
| | |_|/ / | |/| | |
* | | | | am 9fb7e160: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-devRuben Brunk2014-08-304-3/+59
|\| | | |
| * | | | Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-devRuben Brunk2014-08-304-3/+59
| |\ \ \ \
| | * | | | camera2: Add HDR vendor tag for legacy mode.Ruben Brunk2014-08-284-3/+59
| | |/ / /
* | | | | am 58774cf3: Merge "camera2-portability: Touch-to-focus accounting for effect...Igor Murashkin2014-08-296-6/+144
|\| | | |
| * | | | Merge "camera2-portability: Touch-to-focus accounting for effective crop" int...Igor Murashkin2014-08-296-6/+144
| |\ \ \ \
| | * | | | camera2-portability: Touch-to-focus accounting for effective cropSol Boucher2014-08-296-6/+144
* | | | | | am f73c6cf2: Add ability to reset focus and metering regions using API1.Andy Huibers2014-08-291-0/+4
|\| | | | |
| * | | | | Add ability to reset focus and metering regions using API1.Andy Huibers2014-08-281-0/+4
* | | | | | am 415cf3ee: camera2-portability: Allow disabling the shutter sound on API 2Sol Boucher2014-08-281-4/+11
|\| | | | |
| * | | | | camera2-portability: Allow disabling the shutter sound on API 2Sol Boucher2014-08-271-4/+11
| |/ / / /
* | | | | am 47a01cf0: Merge "camera2-portability: Fix and document obscure state machi...Sol Boucher2014-08-271-12/+15
|\| | | |
| * | | | Merge "camera2-portability: Fix and document obscure state machine bug" into ...Sol Boucher2014-08-271-12/+15
| |\ \ \ \
| | * | | | camera2-portability: Fix and document obscure state machine bugSol Boucher2014-08-271-12/+15
* | | | | | am 7d717032: camera2-portability: Fix camera2 takePicture AE regressionSol Boucher2014-08-271-2/+7
|\| | | | |
| * | | | | camera2-portability: Fix camera2 takePicture AE regressionSol Boucher2014-08-271-2/+7
| |/ / / /
* | | | | am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally not working" i...Sol Boucher2014-08-271-3/+12
|\| | | |
| * | | | Merge "camera2-portability: Fix zoom occasionally not working" into lmp-devSol Boucher2014-08-271-3/+12
| |\ \ \ \
| | * | | | camera2-portability: Fix zoom occasionally not workingSol Boucher2014-08-261-3/+12
| | |/ / /
* | | | | am 984a0864: camera2-portability: Optimize out some camera2 AE precapturesSol Boucher2014-08-273-75/+241
|\| | | |
| * | | | camera2-portability: Optimize out some camera2 AE precapturesSol Boucher2014-08-263-75/+241
| |/ / /
* | | | am f27e71f9: Merge "camera2-portability: Switch to ratio-based zoom interface...Sol Boucher2014-08-2310-65/+137
|\| | |
| * | | Merge "camera2-portability: Switch to ratio-based zoom interfaces" into lmp-devSol Boucher2014-08-2310-65/+137
| |\ \ \
| | * | | camera2-portability: Switch to ratio-based zoom interfacesSol Boucher2014-08-2110-65/+137
| | |/ /
* | | | am 336f88ed: Merge "camera2-api: Tag camera2 JPEGs with any provided location...Sol Boucher2014-08-232-2/+30
|\| | |
| * | | Merge "camera2-api: Tag camera2 JPEGs with any provided location" into lmp-devSol Boucher2014-08-232-2/+30
| |\ \ \
| | * | | camera2-api: Tag camera2 JPEGs with any provided locationSol Boucher2014-08-222-2/+30
* | | | | am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API focus modes"...Sol Boucher2014-08-231-3/+10
|\| | | |
| * | | | Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-devSol Boucher2014-08-231-3/+10
| |\ \ \ \
| | * | | | camera2-api: Work around invalid camera2 API focus modesSol Boucher2014-08-221-3/+10
| | |/ / /
* | | | | resolved conflicts for merge of 1870c071 to lmp-dev-plus-aospStephen Hines2014-08-220-0/+0
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge "Remove deprecated carousel from frameworks/ex."Stephen Hines2014-08-2291-6997/+0
| |\ \ \
| | * | | Remove deprecated carousel from frameworks/ex.Stephen Hines2014-08-2291-6997/+0
| |/ / /