summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | add TORCH support to camera1 portability libraryAlan Newberger2014-07-301-0/+2
* | | camera2: Add BlockingCaptureListener class.Ruben Brunk2014-07-252-2/+166
|/ /
* | Merge "camera2-portability: Add focus locks and touch-to-focus for API 2" int...Sol Boucher2014-07-242-54/+330
|\ \
| * | camera2-portability: Add focus locks and touch-to-focus for API 2Sol Boucher2014-07-242-54/+330
* | | am 73513fb9: am b50ab0c2: am 3fbecf11: Update build.gradle from masterJustin Klaassen2014-07-210-0/+0
|\ \ \
| * \ \ am b50ab0c2: am 3fbecf11: Update build.gradle from masterJustin Klaassen2014-07-211-28/+9
| |\ \ \
| | * \ \ am 3fbecf11: Update build.gradle from masterJustin Klaassen2014-07-211-28/+9
| | |\ \ \
| | | * | | Update build.gradle from masterJustin Klaassen2014-07-181-28/+9
* | | | | | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1911-308/+0
| |_|_|/ / |/| | | |
* | | | | DO NOT MERGE: Fix oversight while refactoring CameraStateHolderSol Boucher2014-07-163-42/+3
* | | | | camera2-portability: Add support for previews using the camera2 APISol Boucher2014-07-0818-610/+1988
* | | | | am 366ddf74: (-s ours) am 6f3df8c8: (-s ours) am 0df20a5f: (-s ours) am 2d25a...Baligh Uddin2014-07-060-0/+0
|\| | | |
| * | | | am 6f3df8c8: (-s ours) am 0df20a5f: (-s ours) am 2d25a637: (-s ours) Import t...Baligh Uddin2014-07-060-0/+0
| |\| | |
| | * | | am 0df20a5f: (-s ours) am 2d25a637: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |/| | | | | |/ /
| | * | am 2d25a637: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\ \
| | | * | Import translations. DO NOT MERGEBaligh Uddin2014-07-051-1/+1
* | | | | am 000bd252: (-s ours) keep history after reset to a03388cf9a9bcd78400b6f79aa...Baligh Uddin2014-07-060-0/+0
|\| | | |
| * | | | keep history after reset to a03388cf9a9bcd78400b6f79aa360a5d1e71c7acBaligh Uddin2014-06-230-0/+0
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-1936-0/+756
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-058-0/+224
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 18:24:58 +0000