summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-03-271-3/+3
* Merge "Sync Video torch setting with on-screen indicator" into ub-camera-hale...Spike Sprague2015-03-271-2/+4
|\
| * Sync Video torch setting with on-screen indicatorSpike Sprague2015-03-261-2/+4
* | Hiding manual exposure button in video module.zafir2015-03-262-2/+5
* | Merge "Include HDR on/off correctly in event." into ub-camera-haleakalaAndy Huibers2015-03-271-1/+1
|\ \
| * | Include HDR on/off correctly in event.Andy Huibers2015-03-261-1/+1
* | | Make sure N4 uses the correct texture view transform.Sascha Haeberling2015-03-261-2/+2
|/ /
* | Prevent countdown cancelation from starting the camera on pause.Paul Rohde2015-03-261-2/+5
* | [CaptureIntent] Fix NPE crash when open camera.Senpo Hu2015-03-251-1/+2
* | Merge "Remove the setFocusRatio verbose logspam." into ub-camera-haleakalaPaul Rohde2015-03-261-2/+0
|\ \
| * | Remove the setFocusRatio verbose logspam.Paul Rohde2015-03-251-2/+0
* | | Merge "Change CaptureSession.saveAndFinish to return a future for the URI." i...Sascha Haeberling2015-03-256-50/+98
|\ \ \
| * | | Change CaptureSession.saveAndFinish to return a future for the URI.Sascha Haeberling2015-03-257-51/+98
* | | | Fix build error. Mirror API change to Camera2.Sascha Haeberling2015-03-251-1/+2
* | | | Merge "Catch HAL error that prevents retrieval of resolutions." into ub-camer...Sascha Haeberling2015-03-256-15/+46
|\ \ \ \
| * | | | Catch HAL error that prevents retrieval of resolutions.Sascha Haeberling2015-03-256-15/+46
* | | | | Merge "Cancel in-progress capture when paused" into ub-camera-haleakalaSascha Häberling2015-03-251-12/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Cancel in-progress capture when pausedPuneet Lall2015-03-251-12/+3
| |/ / /
* / / / Suppress HDR 16:9 on N4Alan Newberger2015-03-253-27/+31
|/ / /
* | | Merge "Show error dialog when camera is unavailable." into ub-camera-haleakalazafir2015-03-251-7/+26
|\ \ \ | |/ / |/| |
| * | Show error dialog when camera is unavailable.zafir2015-03-251-7/+26
* | | Merge "[CaptureIntent] Log CaptureDone event to Clearcut." into ub-camera-hal...Senpo Hu2015-03-2510-45/+152
|\ \ \
| * | | [CaptureIntent] Log CaptureDone event to Clearcut.Senpo Hu2015-03-2410-45/+152
* | | | DO NOT MERGE Disable ZSL for N5.Sascha Haeberling2015-03-241-3/+17
|/ / /
* / / Send AF_TRIGGER_CANCEL before every AF_TRIGGER_STARTPuneet Lall2015-03-241-24/+58
|/ /
* | Merge "Fix the camera2 build and import the correct Android metadata." into u...Paul Rohde2015-03-242-3/+5
|\ \
| * | Fix the camera2 build and import the correct Android metadata.Paul Rohde2015-03-242-3/+5
* | | Merge "Hiding manual exposure button in N6. The button was previously disable...zafir2015-03-242-10/+27
|\ \ \ | |/ / |/| |
| * | Hiding manual exposure button in N6. The button was previously disabled.zafir2015-03-232-10/+27
* | | Read and enable face detection when available in capture module.Paul Rohde2015-03-249-23/+185
* | | Merge "Limit maximum display size to prevent out of memory problems." into ub...Andy Huibers2015-03-232-16/+24
|\ \ \
| * | | Limit maximum display size to prevent out of memory problems.Paul Rohde2015-03-232-16/+24
* | | | Merge "Add Faces and Lens Dist. info to photoCaptureDone" into ub-camera-hale...I-Jong Lin2015-03-236-8/+61
|\ \ \ \
| * | | | Add Faces and Lens Dist. info to photoCaptureDoneI-Jong Lin2015-03-236-8/+61
* | | | | Merge "OneCameraOpener should inform ActiveCameraDeviceTracker about camera o...Senpo Hu2015-03-239-29/+51
|\ \ \ \ \
| * | | | | OneCameraOpener should inform ActiveCameraDeviceTracker about camera open.Senpo Hu2015-03-239-29/+51
| |/ / / /
* | | | | Merge "Clean up HDR+ button state logic." into ub-camera-haleakalaSenpo Hu2015-03-237-12/+25
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Clean up HDR+ button state logic.Senpo Hu2015-03-237-12/+25
| |/ / /
* | | | Merge "Compute the max texture size from the EGL context" into ub-camera-hale...Paul Rohde2015-03-232-18/+118
|\ \ \ \
| * | | | Compute the max texture size from the EGL contextPaul Rohde2015-03-232-18/+118
* | | | | Merge "Clamp pixels and bounds for filmstrip images." into ub-camera-haleakalaPaul Rohde2015-03-235-49/+73
|\| | | | | |_|_|/ |/| | |
| * | | Clamp pixels and bounds for filmstrip images.Paul Rohde2015-03-235-49/+73
| |/ /
* / / Check for null on N5 resolution upgradeAlan Newberger2015-03-231-1/+1
|/ /
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+381
* | Merge "Display error dialog and log error when video recording fails to start...zafir2015-03-201-0/+1
|\ \
| * | Display error dialog and log error when video recording fails to start.zafir2015-03-201-0/+1
* | | Merge "Catch memory allocation errors JPEG ImageTask" into ub-camera-haleakalaI-Jong Lin2015-03-201-0/+15
|\ \ \ | |/ / |/| |
| * | Catch memory allocation errors JPEG ImageTaskI-Jong Lin2015-03-201-0/+15
* | | Merge "Re-arrange camera initialization." into ub-camera-haleakalaPaul Rohde2015-03-2046-701/+1325
|\ \ \
| * | | Re-arrange camera initialization.Paul Rohde2015-03-2046-701/+1325
| |/ /