summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* set actionbar background to complete transparentSpike Sprague2014-08-251-0/+4
* 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
* | 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
* | filmstrip actionbar tweaksSpike Sprague2014-08-221-9/+0
* | Merge "filmstrip actionbar tweaks" into ub-camera-glacierSpike Sprague2014-08-223-48/+48
|\ \
| * | filmstrip actionbar tweaksSpike Sprague2014-08-223-57/+51
| |/
* | 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
| |/
* / animate filmstrip bottom button bar in and outSpike Sprague2014-08-213-9/+39
|/
* 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
* | 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
* | | 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
* | | 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
* | | | Remove logspamSascha Haeberling2014-08-201-2/+0
|/ / /
* | | 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
* | | | Start moving AF and 3A to separate class; improve logging.Andy Huibers2014-08-192-76/+123
|/ / /
* | | 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
* | | | Merge "tweak filmstrip show/hide background for Material Design" into ub-came...Spike Sprague2014-08-181-31/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | tweak filmstrip show/hide background for Material DesignSpike Sprague2014-08-191-31/+3
| |/ /
* / / add functionality to enable/disable clicks on a MultiToggleImageButtonSpike Sprague2014-08-183-17/+49
|/ /
* | Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-g...Alan Newberger2014-08-162-0/+13
|\ \
| * | Protect Camera2 functions from null CameraDeviceInfoAlan Newberger2014-08-152-0/+13
* | | Fix orientation and move it to the util class so we can use it elsewhere.Sascha Haeberling2014-08-152-22/+25
| |/ |/|
* | DO NOT MERGE - Reverting accidentally merged 524943 into glacier.Sascha Haeberling2014-08-151-14/+0
* | Merge "Move preview transform matrix code into portability library" into ub-c...Sol Boucher2014-08-152-22/+42
|\ \
| * | Move preview transform matrix code into portability librarySol Boucher2014-08-152-22/+42
* | | Merge "Enable seamless switching to/from camera2-backed Photo module" into ub...Sol Boucher2014-08-156-16/+81
|\ \ \
| * | | Enable seamless switching to/from camera2-backed Photo moduleSol Boucher2014-08-156-16/+81
| |/ /
* | | Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera...Andy Huibers2014-08-151-0/+8
|\ \ \
| * | | Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.Andy Huibers2014-08-151-0/+8
* | | | Merge "Add ability to add a ready-state changed listener to the camera." into...Sascha Haeberling2014-08-154-13/+52
|\ \ \ \ | |/ / / |/| | |
| * | | Add ability to add a ready-state changed listener to the camera.Sascha Haeberling2014-08-154-13/+52
* | | | Hold touch to focus target in 3A UI debug mode.Andy Huibers2014-08-151-12/+18
* | | | Merge "Consolidate properties for debugging." into ub-camera-glacierAndy Huibers2014-08-154-24/+78
|\ \ \ \ | |/ / / |/| | |
| * | | Consolidate properties for debugging.Andy Huibers2014-08-154-24/+78
* | | | Merge "Move preference subscreens to new Activities from Dialogs" into ub-cam...Alan Newberger2014-08-151-26/+57
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Move preference subscreens to new Activities from DialogsAlan Newberger2014-08-151-26/+57
* | | Move code from GoogleCamera that dumps capture request metadata.Sascha Haeberling2014-08-144-23/+326
|/ /
* | add a range check in MultiToggleImageButton's bitmap combine function.Spike Sprague2014-08-131-0/+7
* | Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera...Alan Newberger2014-08-131-1/+1
|\ \
| * | Revert our layout from FULLSCREEN to LAYOUT_FULLSCREENAlan Newberger2014-08-131-1/+1
* | | Merge "Update option icon transitions" into ub-camera-glacierSpike Sprague2014-08-122-21/+181
|\ \ \