summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* am bcc384ea: Revert "Pipe context through to camera"Sascha Häberling2014-09-063-8/+4
|\
| * Revert "Pipe context through to camera"Sascha Häberling2014-09-063-8/+4
* | am f6bf65e9: Pipe context through to cameraSascha Haeberling2014-09-063-4/+8
|\|
| * Pipe context through to cameraSascha Haeberling2014-09-053-4/+8
| * Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacierAlan Newberger2014-09-054-16/+16
| |\
| | * DO NOT MERGE Revert "Update camera2 API usage"Alan Newberger2014-09-054-16/+16
* | | am 200d5f83: Merge "Close the camera when the async open callback runs after ...Alan Newberger2014-09-051-1/+5
|\| |
| * | Merge "Close the camera when the async open callback runs after pause" into u...Alan Newberger2014-09-051-1/+5
| |\ \
| | * | Close the camera when the async open callback runs after pauseAlan Newberger2014-09-051-1/+5
* | | | am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacierEino-Ville Talvala2014-09-054-16/+16
|\| | |
| * | | Merge "Update camera2 API usage" into ub-camera-glacierEino-Ville Talvala2014-09-054-16/+16
| |\ \ \ | | |/ / | |/| / | | |/
| | * Update camera2 API usageEino-Ville Talvala2014-09-054-16/+16
* | | am 29a009c9: Add additional lifecycle logging to CameraAlan Newberger2014-09-053-2/+11
|\| |
| * | Add additional lifecycle logging to CameraAlan Newberger2014-09-053-2/+11
| |/
* | am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doin...Sascha Haeberling2014-09-041-6/+3
|\|
| * Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots...Sascha Haeberling2014-09-041-6/+3
| |\
| | * Load Gcam OneCamera in CaptureModule when it's also doing normal shots.Sascha Haeberling2014-09-041-6/+3
* | | am eacf9460: Merge "remove stray bool resource for determining if OS is L or ...Spike Sprague2014-09-041-10/+4
|\| |
| * | Merge "remove stray bool resource for determining if OS is L or not, moved to...Spike Sprague2014-09-041-10/+4
| |\ \
| | * | remove stray bool resource for determining if OS is L or not,Spike Sprague2014-09-041-10/+4
* | | | am 17d9084e: Add short flash animation and shutter sound to ZSL camera.Andy Huibers2014-09-049-15/+115
|\| | |
| * | | Add short flash animation and shutter sound to ZSL camera.Andy Huibers2014-09-049-15/+115
| |/ /
* | | am f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacierPuneet Lall2014-09-041-0/+1
|\| |
| * | Merge "Added log for first preview frame" into ub-camera-glacierPuneet Lall2014-09-041-0/+1
| |\ \ | | |/ | |/|
| | * Added log for first preview framePuneet Lall2014-09-041-0/+1
* | | am ae6e94f5: Merge "Re-enable shutter-button when switching between front and...Puneet Lall2014-09-042-12/+31
|\| |
| * | Merge "Re-enable shutter-button when switching between front and back cameras...Puneet Lall2014-09-042-12/+31
| |\ \
| | * | Re-enable shutter-button when switching between front and back cameras.Puneet Lall2014-09-032-12/+31
| | |/
* | | am 2ef0f9dc: Fix unnecessary string castAlan Newberger2014-09-041-4/+3
|\| |
| * | Fix unnecessary string castAlan Newberger2014-09-031-4/+3
* | | am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacierAlan Newberger2014-09-043-4/+65
|\| |
| * | Merge "Fixing settings upgrades" into ub-camera-glacierAlan Newberger2014-09-043-4/+65
| |\ \ | | |/ | |/|
| | * Fixing settings upgradesAlan Newberger2014-09-033-4/+65
* | | am 4d6d676c: Refactor default picture size selection in zsl cam.Puneet Lall2014-09-031-19/+32
|\| |
| * | Refactor default picture size selection in zsl cam.Puneet Lall2014-09-031-19/+32
* | | am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size i...Puneet Lall2014-09-031-1/+22
|\| |
| * | Merge "[ZSL Cam] Use largest supported size if no picture size is already set...Puneet Lall2014-09-031-1/+22
| |\ \
| | * | [ZSL Cam] Use largest supported size if no picture size is already set.Puneet Lall2014-09-031-1/+22
* | | | am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remo...Andy Huibers2014-09-031-3/+24
|\| | |
| * | | CaptureModule countdown timer fixes: ability to cancel, and remove premature ...Andy Huibers2014-09-021-3/+24
| | |/ | |/|
* | | am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-gla...Andy Huibers2014-09-034-62/+109
|\| |
| * | Merge "Add countdown timer to CaptureModule." into ub-camera-glacierAndy Huibers2014-09-034-62/+109
| |\ \
| | * | Add countdown timer to CaptureModule.Andy Huibers2014-09-024-62/+109
| | |/
* | | am 7718b87b: Merge "A few Size clean-ups to support live metering changes." i...Sascha Haeberling2014-09-023-88/+163
|\| |
| * | Merge "A few Size clean-ups to support live metering changes." into ub-camera...Sascha Haeberling2014-09-023-88/+163
| |\ \
| | * | A few Size clean-ups to support live metering changes.Sascha Haeberling2014-09-023-88/+163
* | | | am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacierSpike Sprague2014-09-021-4/+7
|\| | |
| * | | Merge "actionbar opactiy tweaks" into ub-camera-glacierSpike Sprague2014-09-021-4/+7
| |\ \ \
| | * | | actionbar opactiy tweaksSpike Sprague2014-09-021-4/+7
| | |/ /
* | | | am 9bfd6bdd: shutter button color fix (pre-L)Spike Sprague2014-09-021-17/+16
|\| | |