summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Camera2: Update white balance chinese translationShuai Yuan2014-04-021-4/+4
| | | | | | Update white balance chinese translation. Change-Id: If6ba29f68595d1bb6db880edadd50760c0e14161
* Merge "Camera2: Fix histogram cover the capture button issue"Linux Build Service Account2014-03-301-1/+1
|\
| * Camera2: Fix histogram cover the capture button issueliangche2014-03-271-1/+1
| | | | | | | | | | | | | | | | | | The change increase the histogram layout marginLeft, then the histogram layout will not cover the capture button layout when camera in landscape mode. Crs-fixed: 622533 Change-Id: I58dc5518f6d96b759c352aea86e14b1acdccb1ea
* | Merge "Camera2: Disable some conflict items when HDR on"Linux Build Service Account2014-03-301-0/+3
|\ \ | |/ |/|
| * Camera2: Disable some conflict items when HDR onliangche2014-03-271-0/+3
|/ | | | | | | | | When HDR on, some conflict items need disable. The change through call onSharedPreferenceChanged to update the UI, which can let these items invisible when HDR on. Crs-fixed: 630787 Change-Id: Ia27b6c816cdf406a00984370c26482b2d6d00791
* Merge "Camera: cancel auto focus after snapshot done if in CAF mode."Linux Build Service Account2014-03-261-0/+4
|\
| * Camera: cancel auto focus after snapshot done if in CAF mode.Kerong Sui2014-03-121-0/+4
| | | | | | | | | | | | | | | | When snapshot in CAF mode, CAF will be locked and update focus status. Application needs call cancelAutoFocus() to resume CAF after snapshot, otherwise CAF will keep in lock state. Change-Id: I2aa3965e407d01efa9dd38b1cb840404390f29ce
* | Merge "Camera2:we should use the same storgae location for back and front ↵Linux Build Service Account2014-03-261-1/+3
|\ \ | | | | | | | | | camera"
| * | Camera2:we should use the same storgae location for back and front cameraKerong Sui2014-03-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | including: menu of native camera and camcoder.The back and front camera have their own storage location, when we set to store in phone or SD-card we need to set it again when we change the camera id. Obviously, this is not what the user's want. Change-Id: Ide9d73d9295439e61b34d2ae9295078f9c5c5578
* | | Merge "Camera2: fix the display error of camera menu when rotate it"Linux Build Service Account2014-03-261-4/+2
|\ \ \
| * | | Camera2: fix the display error of camera menu when rotate itKerong Sui2014-03-211-4/+2
| |/ / | | | | | | | | | | | | | | | | | | including: menu of native camera and camcoder.we should use the right LayoutId for every view when in landscape mode Change-Id: I768a64f32a59c1b89b366409a5e05bf1c0755b0c
* | | Merge "Camera: Rename DIS checkbox to IS"Linux Build Service Account2014-03-261-2/+2
|\ \ \
| * | | Camera: Rename DIS checkbox to ISEmilian Peev2014-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image stabilization will be extended to support DIS/EIS etc. In order to avoid any confusion the DIS checkbox needs to be renamed to the more general IS. Change-Id: I88357c5b47b38cccbf7a76ffdbe9c26047bace31
* | | | Merge "Camera: Open back camera first irrespective of ID"Linux Build Service Account2014-03-263-2/+67
|\ \ \ \
| * | | | Camera: Open back camera first irrespective of IDVijay kumar Tumati2014-03-263-2/+67
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | On 8916, we see back camera probed with camera ID 1. We need to open back camera first in these cases as well. Change-Id: Ie3d71afc75ef92bbb95d748cd581252fb8294e1c
* | | | Merge "camera2: Fix memory leak when suspend/resume camera"Linux Build Service Account2014-03-251-0/+2
|\ \ \ \
| * | | | camera2: Fix memory leak when suspend/resume cameraFei Zhang2014-03-111-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Clear Overrides Map when init, to prevent memory leak. Change-Id: Iaca466f91fb7dc6273b03c2f148439fb1795b1d6
* | | | Merge "Camera2: Reset mTouchAFRunning to false when camera release"Linux Build Service Account2014-03-241-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera2: Reset mTouchAFRunning to false when camera releaseliangche2014-03-201-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Reset mTouchAFRunning to false when camera release, which can avoid camera crash when mCameraDevice is null. Change-Id: I6f7ade2bca96d95cb8d33f28fe6536a7e63852ac Crs-fixed: 635678
* | | Merge "Camera: Draw smile indicator based on display orientation"Linux Build Service Account2014-03-131-4/+12
|\ \ \
| * | | Camera: Draw smile indicator based on display orientationIvan Evlogiev2014-03-111-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, smile indicator is always drawn horizontally which is a vertical line in 90 and 270 degree cases. CRs-Fixed: 539887 587195 Change-Id: I320b90a7a8981075565171e69b64e7d3dc832a6f
* | | | Merge "Camera: Add facial processing features"Linux Build Service Account2014-03-131-0/+122
|\| | |
| * | | Camera: Add facial processing featuresIvan Evlogiev2014-03-111-0/+122
|/ / / | | | | | | | | | | | | | | | | | | Add smile, gaze and blink detection features CRs-fixed: 531927 587195 Change-Id: I7e710e6d9038b14d00d77ea87f9b4c65baa74fc0
* | | Merge "Camera2: Fix HDR and ZSL conflict"Linux Build Service Account2014-03-081-0/+4
|\ \ \ | |_|/ |/| |
| * | Camera2: Fix HDR and ZSL conflictliangche2014-03-061-0/+4
|/ / | | | | | | | | | | | | | | Camera will crash when capture in zsl and hdr mode sametime, fix this issue through enabling one mode will disable the other one. CRs-fixed: 622514 Change-Id: I6a898809a174996f62269a56f2769505042aefee
* | Merge "Camera: Add a feature to choose where to store the picture and video"Linux Build Service Account2014-03-0613-26/+223
|\ \ | |/ |/|
| * Camera: Add a feature to choose where to store the picture and videoSanthosh Kumar H E2014-02-2713-26/+223
| | | | | | | | | | | | | | | | | | | | | | | | Add a feature to choose use SDcard or phone to store picture and video captured by camera and camcorder. Some of the changes are taken from: I987a691c93edc4250fe0366d0623c85ea0152117 CRs-Fixed: 619806 Change-Id: I009df4c70f0a1b49b20750f806c799f025bb6197
* | Merge "Camera: Check if codec supports HFR resolution/fps."Linux Build Service Account2014-03-031-0/+24
|\ \ | |/ |/|
| * Camera: Check if codec supports HFR resolution/fps.Sai Kumar Sanagavarapu2014-01-301-0/+24
| | | | | | | | | | | | | | | | Some codecs can have limitation on the max HFR fps and video size combination. So, query the video encoder capabilites first and report error if codec doesnt support the combination. Change-Id: Ic2032176067a6f92d1363471d1a767d5ef589591
* | Merge "Merge tag 'android-4.4.2_r2' into HEAD"Linux Build Service Account2014-02-200-0/+0
|\ \
| * \ Merge tag 'android-4.4.2_r2' into HEADNeha Pandey2014-02-140-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4.2 Release 2 * tag 'android-4.4.2_r2': Reduce logging of flattened Preferences Change-Id: I7f90dfa99498a81a080736da08a0cada932334a5
| | * | Reduce logging of flattened PreferencesSeth Raphael2013-12-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11901390 Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
* | | | Merge "Close open cursors"Linux Build Service Account2014-02-183-1/+7
|\ \ \ \
| * | | | Close open cursorsSuman Mukherjee2014-02-113-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cursors which got created during any query, needs to be closed finally. Otherwise it'll cause leak in resource and cursor window allocation will fail. Change-Id: I65ace2dc227e0a50c163faba13fdb0fbfa71bc6c CRs-Fixed: 594264
* | | | | Merge "Camera2: Added pause button in Camcorder"Linux Build Service Account2014-02-1816-9/+207
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Camera2: Added pause button in CamcorderManikanta Kanamarlapudi2014-01-2116-9/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added pause button in camcorder app.so that user pause recording and resume later which results in a single recorded clip. CRs-Fixed: 587051 Change-Id: I2a7d8af7fcea74fe8af62c44119c3c1fa0c13e85
* | | | | Merge "Camera: Disable livesnapshot for 4kx2k video"Linux Build Service Account2014-02-131-9/+4
|\ \ \ \ \
| * | | | | Camera: Disable livesnapshot for 4kx2k videoTanmaya Godbole2014-02-111-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Since livesnapshot is not supported for 4kx2k video size, disable it from the UI. 2) Revert parts of commit 2c309499e60120ec513f51bfab02e7d54237af0a to get 4kx2k video recording working. Change-Id: I837f242d505d2c2f07aeb33d81c2560f5b645a39
* | | | | | Merge "Camera: Add support for high speed recording"Linux Build Service Account2014-02-133-6/+62
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Camera: Add support for high speed recordingVijay kumar Tumati2014-02-103-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support 120fps recording without slow motion effect, these changes are needed. This enables 120 FPS for all resolutions if HSR is on. Change-Id: Iece5a382a80f4e3064880d26a29949705352b0e0
* | | | | | Merge "Camera: Add a filter to remove unsupported hfr modes in camcorder"Linux Build Service Account2014-02-101-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Camera: Add a filter to remove unsupported hfr modes in camcorderSanthosh Kumar Thimmanna Bhattar2014-01-281-0/+7
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some sensors don't support some hfr modes, so in camera setting, a filter should be used to block unnecessary menu items. ( cherrypicked from commit a7536c35e22148ee1def337d36fce0682a347c92 ) Change-Id: I5b243e59c99f4daaa36022867d19782b6e2395eb CRs-Fixed: 598600
* | | | | Merge "camera: fix camera crash in hfr"Linux Build Service Account2014-02-041-8/+11
|\ \ \ \ \
| * | | | | camera: fix camera crash in hfrSanthosh Kumar Thimmanna Bhattar2014-02-041-8/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When the maximum supported sizes of 60/90/120 are different, camera will crash when set hfr size to the maximum supported size while the current hfr mode doesn't support. - Fix is to use the supported maximum size of the HFR only when the specified maximum size is not supported by the current HFR mode. ( cherrypicked from commit 494783c6dc29e76adbc7a714062c6739b785ee23 ) Change-Id: Ia74949e5f97d02b22ad817ac7068b5a676004f3a CRs-Fixed: 527339
* | | | | Merge "Camera2: Calculate UI aspect ratio based on preview size"Linux Build Service Account2014-02-042-25/+1
|\ \ \ \ \
| * | | | | Camera2: Calculate UI aspect ratio based on preview sizeVladimir Petrov2014-01-302-25/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This reverts change If4047860. - Simply using preview size instead of picture size at all to calculate the UI aspect ratio, avoiding tricky overwriting aspect ratio. - Will fix issues when surface texture transform is calculated based sometimes on preview size ratio and sometimes on picture size ratio. CRs-Fixed: 601495 Change-Id: I8e054c9eaafc9fb54dac2bff2c67e39f0a1fe64c
* | | | | Merge "Camera: Add checker for null pointer exception during camera release"Linux Build Service Account2014-02-041-0/+3
|\ \ \ \ \
| * | | | | Camera: Add checker for null pointer exception during camera releaseSanthosh Kumar Thimmanna Bhattar2014-01-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In current code, handler will still try to execute command even camera is closed, so add null point checker to skip these commands ( cherrypicked from commit 63ae64c56b00f44956502822a0ddb96307ae7270 ) Change-Id: I71c30a5293364e084de650e92d9d0926e7e3d7c1 CRs-Fixed: 598600
* | | | | | Merge "Camera: Prevent callling of resize before camera is initialized"Linux Build Service Account2014-02-041-0/+4
|\| | | | |
| * | | | | Camera: Prevent callling of resize before camera is initializedSanthosh Kumar Thimmanna Bhattar2014-01-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent callling of resizeForPreviewAspectRatio before camera is initialized ( cherrypicked from commit 57698f01193a75948505d0d6c098364e155c6a5b ) Change-Id: I400dbf30c30f5e2a458eac8fe05449ee055cb0f4 CRs-Fixed: 598600
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 18:34:38 +0000