summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autof...Andy Huibers2014-08-264-8/+7
|\
| * Show animated AF ring UI when lens is moving in continuous autofocus.Andy Huibers2014-08-254-8/+7
* | am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-gla...Andy Huibers2014-08-265-18/+25
|\|
| * Merge "Enable Face rectangles for debugging." into ub-camera-glacierAndy Huibers2014-08-265-18/+25
| |\
| | * Enable Face rectangles for debugging.Andy Huibers2014-08-255-18/+25
* | | am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." ...Sascha Haeberling2014-08-251-4/+8
|\| |
| * | Merge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera...Sascha Haeberling2014-08-251-4/+8
| |\ \ | | |/ | |/|
| | * Fix crash on Shamu since it's no longer camera 2 FULL.Sascha Haeberling2014-08-251-4/+8
* | | am 4cc78bb3: set actionbar background to complete transparentSpike Sprague2014-08-251-0/+4
|\| |
| * | set actionbar background to complete transparentSpike Sprague2014-08-251-0/+4
| |/
* | am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." ...Sascha Haeberling2014-08-239-107/+238
|\|
| * Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camer...Sascha Haeberling2014-08-239-107/+238
| |\
| | * Enable switching within CaptureModule to HDR+ and back.Sascha Haeberling2014-08-229-107/+238
* | | am 799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based sc...Sol Boucher2014-08-238-113/+76
|\| |
| * | Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-...Sol Boucher2014-08-238-113/+76
| |\ \ | | |/ | |/|
| | * Switch from stepwise index-based zoom to a ratio-based scaleSol Boucher2014-08-228-113/+76
* | | am 0dec43e3: filmstrip actionbar tweaksSpike Sprague2014-08-221-9/+0
|\| |
| * | filmstrip actionbar tweaksSpike Sprague2014-08-221-9/+0
* | | am fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacierSpike Sprague2014-08-223-48/+48
|\| |
| * | Merge "filmstrip actionbar tweaks" into ub-camera-glacierSpike Sprague2014-08-223-48/+48
| |\ \
| | * | filmstrip actionbar tweaksSpike Sprague2014-08-223-57/+51
| | |/
* | | am f859793d: Merge "Pick the preview size based on the selected picture size....Sascha Haeberling2014-08-223-56/+46
|\| |
| * | Merge "Pick the preview size based on the selected picture size." into ub-cam...Sascha Haeberling2014-08-223-56/+46
| |\ \
| | * | Pick the preview size based on the selected picture size.Sascha Haeberling2014-08-213-56/+46
| | |/
* | | am ba97d192: animate filmstrip bottom button bar in and out from the bottom o...Spike Sprague2014-08-213-9/+39
|\| |
| * | animate filmstrip bottom button bar in and outSpike Sprague2014-08-213-9/+39
| |/
* | am 0382139c: Merge "Enable progress reporting for modules like HDR+." into ub...Sascha Haeberling2014-08-215-16/+42
|\|
| * Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacierSascha Haeberling2014-08-215-16/+42
| |\
| | * Enable progress reporting for modules like HDR+.Sascha Haeberling2014-08-205-16/+42
* | | am 5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into u...Senpo Hu2014-08-213-3/+11
|\| |
| * | Merge "Change Shamu's default video resolution setting." into ub-camera-glacierSenpo Hu2014-08-203-3/+11
| |\ \
| | * | Change Shamu's default video resolution setting.Senpo Hu2014-08-203-3/+11
* | | | am dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraPro...Sol Boucher2014-08-211-1/+2
|\| | |
| * | | Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into...Sol Boucher2014-08-191-1/+2
| |\ \ \ | | |_|/ | |/| |
| | * | TextureViewHelper workaround for SurfaceTexture/CameraProxy raceSol Boucher2014-08-201-1/+2
* | | | am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-...Andy Huibers2014-08-207-71/+185
|\| | |
| * | | Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacierAndy Huibers2014-08-207-71/+185
| |\ \ \
| | * | | Add zoom to CaptureModule and OneCamera.Andy Huibers2014-08-207-71/+185
* | | | | am e7476817: Remove logspamSascha Haeberling2014-08-201-2/+0
|\| | | |
| * | | | Remove logspamSascha Haeberling2014-08-201-2/+0
| |/ / /
* | | | am 6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera...Sascha Haeberling2014-08-191-1/+9
|\| | |
| * | | Merge "roduce debug output for android.util.Pair" into ub-camera-glacierSascha Haeberling2014-08-191-1/+9
| |\ \ \
| | * | | roduce debug output for android.util.PairSascha Haeberling2014-08-191-1/+9
* | | | | am 03e17a62: Start moving AF and 3A to separate class; improve logging.Andy Huibers2014-08-192-76/+123
|\| | | |
| * | | | Start moving AF and 3A to separate class; improve logging.Andy Huibers2014-08-192-76/+123
| |/ / /
* | | | am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule...Alan Newberger2014-08-191-1/+1
|\| | |
| * | | Merge "Remove extra parent mode from array, and make PhotoModule scope string...Alan Newberger2014-08-161-1/+1
| |\ \ \
| | * | | Remove extra parent mode from array, and make PhotoModule scope string publicAlan Newberger2014-08-181-1/+1
* | | | | am 5f8927b9: Merge "tweak filmstrip show/hide background for Material Design"...Spike Sprague2014-08-191-31/+3
|\| | | |
| * | | | Merge "tweak filmstrip show/hide background for Material Design" into ub-came...Spike Sprague2014-08-181-31/+3
| |\ \ \ \ | | |_|_|/ | |/| | |