summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in lmp-release history after reset to d5205c2648ba1213f28a232379d10b07a...The Android Automerger2014-09-060-0/+0
|\
| * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-09-040-0/+0
| |\
| | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-09-030-0/+0
| |/|
| | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-09-020-0/+0
| |/|
| | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-09-010-0/+0
| |/|
| | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-08-310-0/+0
| |/|
| | * camera2-portability: Fix camera2 takePicture AE regressionSol Boucher2014-08-271-2/+7
| | * merge in lmp-release history after reset to 7c8d6957b96c75ce11f7373f4ab2451ee...The Android Automerger2014-08-270-0/+0
| | |\
| | | * merge in lmp-release history after reset to f27e71f979e803a3ac00f4057eb909886...The Android Automerger2014-08-260-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to f27e71f979e803a3ac00f4057eb909886...The Android Automerger2014-08-250-0/+0
| | | |/|
| | | | * merge in lmp-release history after reset to f27e71f979e803a3ac00f4057eb909886...The Android Automerger2014-08-240-0/+0
| | | |/|
| | | | * merge in lmp-release history after reset to f27e71f979e803a3ac00f4057eb909886...The Android Automerger2014-08-230-0/+0
| | | |/|
| | | | * camera2-portability: Play shutter sound for camera2 capturesSol Boucher2014-08-221-1/+5
| | | | * merge in lmp-release history after reset to 489e29ecbfd2ffe10ebd199204f3ee242...The Android Automerger2014-08-210-0/+0
| | | | |\
| | | | | * merge in lmp-release history after reset to 489e29ecbfd2ffe10ebd199204f3ee242...The Android Automerger2014-08-200-0/+0
| | | | |/|
| | | | | * merge in lmp-release history after reset to 489e29ecbfd2ffe10ebd199204f3ee242...The Android Automerger2014-08-190-0/+0
| | | | |/|
| | | | | * merge in lmp-release history after reset to d0e873ab838702c69ddbe4ca952394934...The Android Automerger2014-08-180-0/+0
| | | | | |\
| | | | | | * merge in lmp-release history after reset to d0e873ab838702c69ddbe4ca952394934...The Android Automerger2014-08-170-0/+0
| | | | | |/|
| | | | | | * merge in lmp-release history after reset to c6344faeff899655abd60b3bf4cd638e5...The Android Automerger2014-08-140-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-release history after reset to 47497bee8a3550af79f9a32c9362d7ee7...The Android Automerger2014-08-130-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-release history after reset to 47497bee8a3550af79f9a32c9362d7ee7...The Android Automerger2014-08-120-0/+0
| | | | | | | |/|
| | | | | | | | * merge in lmp-release history after reset to 47497bee8a3550af79f9a32c9362d7ee7...The Android Automerger2014-08-110-0/+0
| | | | | | | |/|
| | | | | | | | * merge in lmp-release history after reset to 47497bee8a3550af79f9a32c9362d7ee7...The Android Automerger2014-08-100-0/+0
| | | | | | | |/|
| | | | | | | | * merge in lmp-release history after reset to 47497bee8a3550af79f9a32c9362d7ee7...The Android Automerger2014-08-090-0/+0
| | | | | | | |/|
| | | | | | | | * Fix missing zoom fields in copy constructor of CameraCapabilitiesAlan Newberger2014-08-081-0/+2
* | | | | | | | | 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
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Camera2: Renames for API consistencyEino-Ville Talvala2014-09-0511-89/+90
* | | | | | | | | ex: Avoid exception if HDR_SCENE_MODE name changes.Ruben Brunk2014-09-031-3/+9
| |/ / / / / / / |/| | | | | | |
* | | | | | | | 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
| |/ / / / / / /
* | | | | | | | 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
* | | | | | | | | Add ability to reset focus and metering regions using API1.Andy Huibers2014-08-281-0/+4
* | | | | | | | | camera2-portability: Allow disabling the shutter sound on API 2Sol Boucher2014-08-271-4/+11
|/ / / / / / / /
* | | | | | | | 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
| | |/ / / / / / | |/| | | | | |
* / | | | | | | camera2-portability: Fix camera2 takePicture AE regressionSol Boucher2014-08-271-2/+7
|/ / / / / / /
* | | | | | | 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
| |/ / / / / /
* / / / / / / camera2-portability: Optimize out some camera2 AE precapturesSol Boucher2014-08-263-75/+241
|/ / / / / /
* | | | | | 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
| |/ / / / /
* | | | | | 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
* | | | | | | 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
| |/ / / / / /
* | | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |