summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: FrameListener and Video frame processorJack Yoo2016-07-0711-138/+949
| | | | | | | | Adding FrameListener with TrackingFocus Adding VideoFrameProcessor with beautification Change-Id: Id51a0417af43140ed27ea5859ff939adc2e78c43 CRs-Fixed: 1035245
* Merge "SnapdragonCamera: Allow take snapshot while recording video" into ↵Camera Software Integration2016-07-043-28/+149
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Allow take snapshot while recording videoByunghun Jeon2016-06-293-28/+149
| | | | | | | | | | | | | | | | Allow take snapshot while recording video by showing shutter button. Directly call capture when shutter button is pressed. Change-Id: Iae4d42d8878ea82b459ec67709b0ad8e340c8226 CRs-Fixed: 1028463
* | Merge "SnapdragonCamera: Fix pause while taking continuous shot" into ↵Camera Software Integration2016-07-041-0/+8
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix pause while taking continuous shotByunghun Jeon2016-06-291-0/+8
| | | | | | | | | | | | | | | | | | When pause/resuming initialize to proper state so that when paused/resumed while taking picture, it would not result in a bad state Change-Id: I597aa96b930cdb855c83d2f433470c23ab9cfa37 CRs-Fixed: 1025804
* | Merge "SnapdragonCamera: Add face detection to camera2" into ↵Camera Software Integration2016-07-045-75/+359
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add face detection to camera2Byunghun Jeon2016-06-295-75/+359
| | | | | | | | | | | | | | | | Add face detection to camera2. Receive face data from camera2 and use faceView UI to draw it Change-Id: Id9c49ab6dd73de316398c57981cc0b9df0400b45 CRs-Fixed: 1025797
* | Merge "SnapdragonCamera: Use json file to read setting dependency" into ↵Camera Software Integration2016-07-041-187/+122
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Use json file to read setting dependencyByunghun Jeon2016-06-291-187/+122
| | | | | | | | | | | | | | Instead of writing the dependency in java, read the dependency from json file Change-Id: I5a46d35b66a289e2a3ee8b72d0059fd9929891f2
* | Merge "SnapdragonCamera: Add video to Camera2 module" into ↵Camera Software Integration2016-07-047-35/+954
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add video to Camera2 moduleByunghun Jeon2016-06-297-35/+954
| | | | | | | | | | | | Add video to Camera2 module and combine the UI Change-Id: I0bcd86eb6b95fe2180856780ddd794682259e799
* | Merge "SnapdragonCamera: Fix first-time crash and cleanup permissions" into ↵Camera Software Integration2016-07-012-5/+7
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix first-time crash and cleanup permissionsJay Wang2016-06-262-5/+7
| |/ | | | | | | | | | | | | | | | | | | | | As onCreate skips the creation of setting manager when the critical permissions are not granted, this causes the onDestroy to call setting manager destroy function with null pointer. Fix the issue with null check. In addition, remove unused permissions from manifest file Change-Id: I99b5f09449aacfb7eb9a5771e446df75956a9827 CRs-Fixed: 1034202
* | Merge changes I07ef3392,Ie0b04a07 into camera.lnx.1.0-dev.1.0Camera Software Integration2016-07-013-13/+13
|\ \ | | | | | | | | | | | | | | | * changes: SnapdragonCamera: Fix the crash caused by Ubifocus help menu SnapdragonCamera: Adjust the low memory device threshold
| * | SnapdragonCamera: Fix the crash caused by Ubifocus help menuJay Wang2016-06-242-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the Ubifocus UI operation is called from camera thread and caused the exception. To resolve the issue, make sure UI operation is done only in UI thread. Change-Id: I07ef3392577169ecd642bf98a6c39de3580e963d CRs-Fixed: 1032532
| * | SnapdragonCamera: Adjust the low memory device thresholdJay Wang2016-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove Ubifocus and Opti-zoom from the scene mode when the device has memory less than 2GB Change-Id: Ie0b04a0786241fe7ba0035906c4dafe5215dc83e CRs-Fixed: 1003404
* | | Merge "SnapdragonCamera: add jpeg crop parrameter support" into ↵Camera Software Integration2016-07-011-0/+6
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: add jpeg crop parrameter supportJay Wang2016-06-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for crop data when sending JPEG encode requests. CRs-Fixed: 993611 Change-Id: Icbd960160d651a3422c2b8530608fcd5dba97735
* | | | Merge "SnapdragonCamera: read jpeg quality from settings before setting." ↵Camera Software Integration2016-07-011-3/+3
|\| | | | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: read jpeg quality from settings before setting.Jay Wang2016-06-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to apply up to date jpeg quality value from SettingsManager before applying to capture request. CRs-Fixed: 993611 Change-Id: Ia335ba346f433f3b05a62676e742ab5a72b8389a
* | | | Merge "SnapdragonCamera: Reorder logic when closing cameras" into ↵Camera Software Integration2016-07-011-30/+34
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Reorder logic when closing camerasJay Wang2016-06-271-30/+34
| | |/ | |/| | | | | | | | | | | | | | | | | | | Re-order calls to unlink all cameras and close sessions before closing any devices. CRs-Fixed: 993611 Change-Id: I0e753a5286799ff59637333cc00231c96709a3e7
* | | Merge "SnapdragonCamera: Fix the camera setting corruption issue" into ↵Camera Software Integration2016-07-014-7/+33
|\ \ \ | |/ / |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix the camera setting corruption issueJay Wang2016-06-214-7/+33
| |/ | | | | | | | | | | | | | | | | | | | | | | Two instances of camera preference were created and caused the wrong preference instance is referenced when changing the camera2 mode. Due to this, it corrupted the camera setting on the other camera device. To resolve the issue, create single instance of camera preference and re-use it. Change-Id: Ia1a6923a10b83e4c5777fb1318677c1f191942fb CRs-fixed: 1025776
* | Merge "SnapdragonCamera: Add touchAE to camera2" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-242-24/+79
|\ \
| * | SnapdragonCamera: Add touchAE to camera2Byunghun Jeon2016-06-212-24/+79
| |/ | | | | | | | | | | | | | | | | Add touchAE to camera by setting AE_Region. It uses the same logic as touchAF to calculate the region. Also fixed the region calculation of AF. Change-Id: Id83f3bd3042d41e2a36c18eb30e476ff1a66dfae CRs-Fixed: 1025759
* | Merge "SnapdragonCamera: Fix slow zooming issue" into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-241-5/+3
|\ \
| * | SnapdragonCamera: Fix slow zooming issueJay Wang2016-06-171-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Zoom range calculation didn't give enough precision and caused non-smooth zooming experience. Make the change to keep the full fractional digits. Change-Id: Ib72707e451ea7c4e375d489d183265592622ce0b CRs-Fixed: 1025788
* | | Merge "SnapdragonCamera: skip dual cam crop info in clearsight img" into ↵Linux Build Service Account2016-06-241-9/+89
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: skip dual cam crop info in clearsight imgJay Wang2016-06-211-9/+89
| | |/ | |/| | | | | | | | | | | | | | | | Remove dual cam crop info in Clearsight images. CRs-Fixed: 993611 Change-Id: I9ef6d7b4b5881119bd232648c575c378e8ef9c7d
* / | SnapdragonCamera: fix front back camera toggle crashJay Wang2016-06-212-7/+36
|/ / | | | | | | | | | | | | | | | | | | | | - Fix logic when switching camera id from front to back in dual camera setup. - Only init Clearsight once. - Wait for second surface for aux camera to become ready before attempting to create session. CRs-Fixed: 993611 Change-Id: Icec4af06535f29bc75790b1d57eed212f7a86727
* | Merge "SnapdragonCamera: Fix picture saved when no sdcard inserted" into ↵Camera Software Integration2016-06-201-0/+6
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix picture saved when no sdcard insertedByunghun Jeon2016-06-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix picture being saved when save path is set to sdcard but no sdcard present. In this case, picture should not be saved Check this before taking a picture Change-Id: I7313d67f2f5c489c2db230b8ae165b89ecfbc4c6 CRs-Fixed: 1025784
* | | Merge "SnapdragonCamera: Filter duplicate picture resolution" into ↵Camera Software Integration2016-06-202-1/+2
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Filter duplicate picture resolutionByunghun Jeon2016-06-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Filter picture resolution with duplicate name. There can be 2 different picture resolutions with the same name. Take only the first one. Change-Id: I9a472d958b829d3dce9559d4fcacb5d0dfd3e598 CRs-Fixed: 1025767
* | | Merge "SnapdragonCamera: Fix picture orientation" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-201-3/+1
|\| |
| * | SnapdragonCamera: Fix picture orientationByunghun Jeon2016-06-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix picture orientation when device is in landscape. We need to use mOrientation for calculating proper orientation for jpeg because this field contains the right orientation information (portrait/landscape) Change-Id: I25137265c1037a6121e0e89828b78dd4bc1c35d4 CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Add redeye reduction" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-203-1/+22
|\| |
| * | SnapdragonCamera: Add redeye reductionByunghun Jeon2016-06-093-1/+22
| | | | | | | | | | | | | | | | | | | | | Add redeye reduction to Camera2 Change-Id: Iae4beb9287a0a927330ba987238fac6a2dae058e CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Fix initial camera id" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-203-8/+11
|\| |
| * | SnapdragonCamera: Fix initial camera idByunghun Jeon2016-06-093-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | Fix initial camera id to proper value. Previously it was always using 0 as initial id Change-Id: Ifc8d63ba2bccb4afcc25445d6713e28732e7deb4 CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Fix savepath set to SD card crash" into ↵Camera Software Integration2016-06-201-5/+21
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix savepath set to SD card crashByunghun Jeon2016-06-091-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash issue when fix savepath is set to SD card and the app is restarted. This is due to not updating storage information. When the module starts up, we need to call storage update so that it will set to proper initial value, not causing crash. Also only update focus UI when AF state is not null. Change-Id: I1a3e444b42eb988ed622d047b1f3dc42bec7a119 CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Sharpshooter post filter" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-208-31/+277
|\| | | |/ |/|
| * SnapdragonCamera: Sharpshooter post filterJack Yoo2016-06-088-31/+277
| | | | | | | | | | | | | | Adding Sharpshooter post process filter Change-Id: I8f3c1962db437e7dfbe2973f806a3f9a26480eb7 CRs-Fixed: 1023183
* | SnapdragonCamera: Multiple fixes in SettingManagerJay Wang2016-06-152-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | - Setting manager instance was not destroyed when camera activity onDestroy is called and a new instance is created again when onCreate is called. Make change to destroy the setting manager during onDestroy. - Include high resolution picture sizes to the picture size list Change-Id: Id6cb52da1419f7e723304236b5d2c204d217398c CRs-Fixed: 1025845, 1025789
* | Merge "SnapdragonCamera: Fixed M permission issue" into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-103-33/+43
|\ \
| * | SnapdragonCamera: Fixed M permission issueJay Wang2016-06-023-33/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Resolved NPE while sending permission request - Made change to request non-critical permissions once only, but the critical permssions all th time. - Removed unused contant defines CRs-Fixed: 1019847 Change-Id: Ib997244cbcc041d86c094c7ee7a902bff56e92ad
* | | Merge "Fixes to M permissions." into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-102-5/+28
|\| |
| * | Fixes to M permissions.zafir2016-06-022-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called PermissionsActivity with startActivityForResult(). However, this creates race conditions as we check for permissions and the CameraActivity continues to operate. Now, we end CameraActivity and launch a new instance upon successful permissions resolution. We can also put the preload filmstrip logic back in its original place in onCreate. The checks for permissions happen in both onCreate and onResume. Bug: 22442745, 22478144, 22497152 CRs-Fixed: 1019847 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0 (cherry picked from commit ac0e2425e77a9b69e76d2f31876798825ea44584)