summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Camera: Disable HDR when scene mode is other than auto"Linux Build Service Account2014-05-081-0/+5
|\ \ \ | |/ / |/| |
| * | Camera: Disable HDR when scene mode is other than autoSanthosh Kumar Thimmanna Bhattar2014-04-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - HDR option is enabled even when scene mode is not auto. Due to this preview and snapshot are still remain in previous scene mode after enabling HDR. - Fix is to disable the HDR when scene mode is other than auto Change-Id: I6f75f3c686d79757c464deaeca495de767bdabb0 CRs-Fixed: 648847
* | | Merge "Camera2: Fix camera application memory leak"Linux Build Service Account2014-05-071-8/+25
|\ \ \
| * | | Camera2: Fix camera application memory leakGaoxiang Chen2014-04-241-8/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fix potential memory leak of camera application when swith between camera and panorama: 1. free allocated frames in jni/Mosaic 2. use application context instead of acitivity context 3. clear disappearing children of ViewGroup explicitly 4. remove IdleHandler during camera exit CRs-fixed: 622518 Change-Id: I2583709489ab2cf1fc20865fe7d2a8f56f2763c9
* / / Camera2: disable ZSL setiing when in counting downKerong Sui2014-04-281-0/+3
|/ / | | | | | | | | | | | | | | | | When we touch the button and snapshot using time counting down. we should not enable and disable the ZSL frequently. So disable the menu when in counting down Change-Id: I38ed28506fe33d784518c28767359eed41af9b74 CRs-fixed: 653607
* | Merge "Camera2: add UI option to on/off longshot"Linux Build Service Account2014-04-211-4/+8
|\ \
| * | Camera2: add UI option to on/off longshotFei Zhang2014-04-141-4/+8
| | | | | | | | | | | | | | | | | | Add a menu option to turn on/off longshot. Change-Id: I21b5b8e8181317dc2db5ece44a60be66a52f5d0a
* | | Merge "Camera2: update the flash icon when set HDR on"Linux Build Service Account2014-04-191-0/+2
|\ \ \
| * | | Camera2: update the flash icon when set HDR onKerong Sui2014-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When HDR is on the flash mode should be set to off. And the icon should be show as off too Change-Id: I2cca985694e8a5a8058d6bf5467d5375514acfab CRs-fixed: 645595
* | | | Merge "Camera2: fix the picture format not update problem"Linux Build Service Account2014-04-191-0/+1
|\ \ \ \
| * | | | Camera2: fix the picture format not update problemKerong Sui2014-04-101-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we set the ZSL on, the picture format should change to Jpeg immediately. So we override the setting menu. Change-Id: Ie24acf61667a7faa7603d8c3876bcba0ec0da5c2 CRs-fixed: 621806
* | | | Merge "Camera2: enable touch af/aec in HDR mode"Linux Build Service Account2014-04-151-1/+2
|\ \ \ \
| * | | | Camera2: enable touch af/aec in HDR modeFei Zhang2014-04-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HDR is treated as a scene mode, and focus mode is set to autofoucs in back-end when HDR is on. This patch enable touch af/aec on UI in HDR mode. Change-Id: I81fae08cf794a0c27c2106080b7c9dd6f35d4b61
* | | | | Merge "Camera2: Do not turn off touch af for AOST"Linux Build Service Account2014-04-141-1/+0
|\ \ \ \ \
| * | | | | Camera2: Do not turn off touch af for AOSTIvan Evlogiev2014-04-101-1/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | - Touch af should work for AOST Change-Id: Icc56acf59c4b4648732a294bad333c49fc656b45
* | | | | Merge "Camera: AF circle is not coming on 1'st tap while FD is ON"Linux Build Service Account2014-04-141-6/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Camera: AF circle is not coming on 1'st tap while FD is ONSuman Mukherjee2014-04-081-6/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISSUE: For ZSL mode, face detection last callback is received in 40-50ms after calling stopfacedetection on camera device. Due to this, even though application immediately clears UI, invalid circles remain on screen. To avoid that, earlier fix made to delay clearing of face circles by 100ms. With that fix, for non-zsl case, AF circle is not appearing on 1'st tap with FD. Fix: Change made in HAL so that this delay issue will not be there. In application, made the code aligned to base android by removing the 100ms delay in clearing faces. Change-Id: I44b4d5c40c45aad553a00243f9b39f414b8e3c1e CRs-Fixed: 638111
* / / / Camera: Fix scene disable during zsl/non-zsl switchEmilian Peev2014-04-081-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The scenes were incorrectly overriden when switching to/from zsl, non-zsl. This should happen only when the an AOST feature is enabled. Change-Id: Idfaa50da7330736e1c09b7c5400d58bf0995fd01 CRs-Fixed: 644444
* | | Camera2: Override camera settings for advanced camera featuresIvan Evlogiev2014-04-011-15/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When any of advanced camera features are enabled: - scene mode needs to be auto - ae bracketing needs to be disabled - red eye reduction needs to be disabled - flash needs to be off - focus mode need to be infinity - touch ae/af need to be disabled - exposure compensation need to be 0 - color effect need to be none Change-Id: I2520d13b7b40452a93a133aaf416eb16072613a4 CRs-fixed: 625657
* | | Camera2: override UI options when scene mode is enabledRajaram Gudivada2014-04-011-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When HDR or any other scene mode is enabled, following UI options are turned to grey saturation contrast sharpness coloreffect CRs-Fixed: 627382 Change-Id: Ie4550bc7d2342d703062519815a5bb03bfbb496b
* | | 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
* / / Camera: Open back camera first irrespective of IDVijay kumar Tumati2014-03-261-0/+31
|/ / | | | | | | | | | | | | | | 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
* | Camera: Add a feature to choose where to store the picture and videoSanthosh Kumar H E2014-02-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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 "Camera2: Calculate UI aspect ratio based on preview size"Linux Build Service Account2014-02-041-5/+1
|\ \
| * | Camera2: Calculate UI aspect ratio based on preview sizeVladimir Petrov2014-01-301-5/+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: 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
* | | | Merge "Camera2: Synchronize access to camera parameters"Linux Build Service Account2014-02-041-25/+33
|\| | |
| * | | Camera2: Synchronize access to camera parametersSanthosh Kumar Thimmanna Bhattar2014-01-131-25/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Concurrent access between the main handler thread and the camera start-up thread w.r.t. 'mParameters' is possible. This change will synchronize the two threads in order to avoid any exceptions. ( cherrypicked from commit e988411c441410f270fe0b98dfd0d9b1f033503f ) Change-Id: I290452723b3687eba5240f451cc94aef175a9fc4 CRs-Fixed: 539634
* | | | Merge "Camera2: Check mCameradevice before setting skinToneEnhancement"Linux Build Service Account2014-02-041-1/+1
|\| | |
| * | | Camera2: Check mCameradevice before setting skinToneEnhancementSanthosh Kumar Thimmanna Bhattar2014-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Null pointer exception in app is observed when we open camera and immediately press home/back button. This is because mCameradevice will be null by the time handler thread gets a message to setskinToneEnhancement parameter. ( cherrypicked from commit 06fee777df529fa53ac5c5305e7324ad1baf085d ) Change-Id: I7f216a11a29b6b205be4c2d0ca8f1c346284c294 CRs-Fixed: 547522
* | | | Merge "Camera2: override Saturation&Contrast item when enable scence mode"Linux Build Service Account2014-02-041-5/+10
|\| | |
| * | | Camera2: override Saturation&Contrast item when enable scence modeSanthosh Kumar Thimmanna Bhattar2014-01-131-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When HDR or any other scene mode is enabled, should disable the saturation and contrast items into gray. ( cherrypicked from commit aceeee3ef5812836265127ed784adb4ab5ed57fb ) Change-Id: Ia4e20e0ee2f80661c8b72bf81aeee6fa96dcdf1f CRs-Fixed: 526617
* | | | Merge "Update settings pref values when BSM is not auto."Linux Build Service Account2014-01-301-4/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Update settings pref values when BSM is not auto.Santhosh Kumar H E2014-01-161-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When BSM mode is set to a value other than auto, flash mode, white balance and few more settings will not be based on user preferred settings. So mParameter object will have default values. Updating those values in the list will over write the preferences. To preserve settings from preferences, we need to pass the same values. CRs-Fixed: 573584 Change-Id: Ic62dc537250468f189374fae9a897ee46d40e3a1
* | | | Merge "Camera: Dont reset camera state while capture is in progress."Linux Build Service Account2014-01-261-1/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Camera: Dont reset camera state while capture is in progress.Santhosh Kumar Thimmanna Bhattar2014-01-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While capture is in progress and if we get autofocus event, currently we reset the camera state to IDLE blindly. This is resulting in app exception because it will trigger another takepicture and lower layers will return error. ( cherrypicked from commit 1bed537bb0848b6a1f64f9eb245b1c256999ebad ) Change-Id: Ia595dbad246759870371b749c0aa2def221560c5 CRs-Fixed: 550417
* | | | Merge "Camera2: Enable HDR for zsl mode"Linux Build Service Account2014-01-251-28/+1
|\ \ \ \
| * | | | Camera2: Enable HDR for zsl modeEvgeniy Borisov2014-01-081-28/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | HDR is now supported for zsl mode Change-Id: Ic9985e9f2ca6ffea3f33aef1f6f2949d4876c8d9
* | | | Merge "Camera: Change copy right year back to 2012"Linux Build Service Account2014-01-161-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera: Change copy right year back to 2012Vijay kumar Tumati2014-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this is 3rd party file, we shouldn't change copy right year. Reverting it back to 2012. Change-Id: If617e7607cd89b0270aabbe1186190dfe06fe40c
* | | | Merge "Camera: Avoid preview restart after capture if possible"Linux Build Service Account2014-01-111-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Camera: Avoid preview restart after capture if possibleEmilian Peev2013-12-181-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If the camera supports implicit preview restart after image capture, then this sequence will be skipped in order to improve KPI. Change-Id: I13b52255f1aa82805a67ad688a9964f84a447d5a
* | | | Camera: Don't do cancel_af till all CBs are received in burst shotVijay kumar Tumati2014-01-071-2/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing cancel_af in the first jpeg CB while burst shot is going on, is changing the camera state to IDLE and allowing next takePicture() which is resulting in crash as this call reaches HAL when camera is in picture taking state. Change-Id: Idd146060a73161bcc30c34756fb53662bb1f0902 CRs-Fixed: 593352
* | | Merge "Camera: Enable module switcher on resume"Linux Build Service Account2013-12-201-0/+3
|\ \ \
| * | | Camera: Enable module switcher on resumeSuman Mukherjee2013-12-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For HDR mode, on pressing shutter key, module switcher icon will be turned off. That'll not be activated if user relaunch camera after pressing home key in HDR mode while capturing image. Enable switcher in UI on resuming camera module. Change-Id: I094f4941f87149e4c5b2393881ed5175c4388559 CRs-fixed: 580450
* | | | Merge "Camera: Avoid animating cature with decoded jpeg in long shot"Linux Build Service Account2013-12-201-1/+3
|\ \ \ \
| * | | | Camera: Avoid animating cature with decoded jpeg in long shotVijay kumar Tumati2013-12-201-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decoding full jpeg image and animating capture with that is causing lot of delays which effects long shot stability.This change avoids that. CRs-Fixed: 586568 Change-Id: I0133cc55e5efcc801dd9a98c289dec965aa35984
* | | | Merge "Camera: Add support for UbiFocus, ChromaFlash and OptiZoom."Linux Build Service Account2013-12-201-0/+51
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 05:45:50 +0000