summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | Merge "camera2-portability: Play shutter sound for camera2 captures" into lmp...Sol Boucher2014-08-221-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | camera2-portability: Play shutter sound for camera2 capturesSol Boucher2014-08-221-1/+5
| | |/ | |/|
* | | Merge "Remove deprecated carousel from frameworks/ex." into lmp-devStephen Hines2014-08-21116-7666/+0
|\ \ \ | |/ / |/| |
| * | Remove deprecated carousel from frameworks/ex.Stephen Hines2014-08-20116-7666/+0
* | | Merge "Add exception logging to CameraDeviceInfo retrieval failure" into lmp-devAlan Newberger2014-08-161-0/+1
|\ \ \
| * | | Add exception logging to CameraDeviceInfo retrieval failureAlan Newberger2014-08-181-0/+1
* | | | Merge "Consolidate parameter caching in camera1 portability agent" into lmp-devAlan Newberger2014-08-151-55/+90
|\| | |
| * | | Consolidate parameter caching in camera1 portability agentAlan Newberger2014-08-151-55/+90
* | | | Merge "camera2-portability: Provide preview transformation matrix" into lmp-devSol Boucher2014-08-152-16/+118
|\ \ \ \
| * | | | camera2-portability: Provide preview transformation matrixSol Boucher2014-08-152-16/+118
| | |/ / | |/| |
* | | | Merge "camera2-portability: Make factory offer choice of backing API" into lm...Sol Boucher2014-08-154-14/+179
|\ \ \ \
| * | | | camera2-portability: Make factory offer choice of backing APISol Boucher2014-08-154-14/+179
* | | | | Merge "Add public method to check if the partition is empty." into lmp-devNancy Chen2014-08-151-1/+5
|\ \ \ \ \
| * | | | | Add public method to check if the partition is empty.Nancy Chen2014-08-151-1/+5
| | |_|/ / | |/| | |
* | | | | Merge "camera2-portability: Improve capability conversions' null-safety" into...Sol Boucher2014-08-151-6/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | camera2-portability: Improve capability conversions' null-safetySol Boucher2014-08-131-6/+14
| | |/ / | |/| |
* / | | camera2-portability: Report correct sizes for preview and captureSol Boucher2014-08-131-7/+7
|/ / /
* | | Merge "Fix missing zoom fields in copy constructor of CameraCapabilities" int...Alan Newberger2014-08-071-0/+2
|\ \ \
| * | | Fix missing zoom fields in copy constructor of CameraCapabilitiesAlan Newberger2014-08-071-0/+2
* | | | Merge "camera2-portability: Support photo capture using camera2 API" into lmp...Sol Boucher2014-08-0715-560/+1137
|\ \ \ \ | |/ / / |/| | |
| * | | camera2-portability: Support photo capture using camera2 APISol Boucher2014-08-0715-560/+1137
| |/ /
* / / Camera2: Remove hidden callbacksEino-Ville Talvala2014-08-042-80/+4
|/ /
* | Merge "Create new com.android.ex.camera2.utils package" into lmp-devSol Boucher2014-07-298-0/+1001
|\ \
| * | Create new com.android.ex.camera2.utils packageSol Boucher2014-07-308-0/+1001