summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Camera2: fix start preview when hdr is on issue"Linux Build Service Account2014-06-191-1/+2
|\ \ \ \
| * | | | Camera2: fix start preview when hdr is on issueKerong Sui2014-06-171-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we have already set hdr on and do not set off, we don't need to set it to scene mode to auto every time. This will make the camerea to start preview again, which will make the app freeze for a while Change-Id: Ica77106b88056e289cd298eda4ccc5c3f4f6ab59 CRs-Fixed: 679200
* / / / Camera2: fix The flashlight still is on after set scene mode not autokaiyiz2014-06-161-3/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set flash mode is on when scene mode is auto, the flash mode won't be reset when change to other scenemode and still is on. Set the flash mode is auto when scene mode is not auto. CRs-Fixed: 678466 Change-Id: If3874c03dc70297326b6cd7dcceb1f4efde85956
* | | Merge "Camera2: Adding support for Auto HDR"Linux Build Service Account2014-06-146-8/+150
|\ \ \
| * | | Camera2: Adding support for Auto HDRAbhishek Pant2014-06-066-8/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* | | | Merge "Camera: Mem-leak"Linux Build Service Account2014-06-137-10/+74
|\ \ \ \
| * | | | Camera: Mem-leakSuman Mukherjee2014-06-097-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hprof identified memleak in localdatalist from list and hashmap Reason: removedata was not getting invoked. Fix Made: Invoke removedata from ondestroy and onresume of camera activity Cleanup bitmaps before reallocation on same variable. CRs-Fixed: 655256 Change-Id: I42d99beb7e493eea2394462ee02cbe956e86c502
* | | | | Camera2: fix a camera status bugLikai Ding2014-06-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a picture is taken for MMS app, the preview has been stopped in onPictureTaken() but the camera state is subsequently set to IDLE in ZSL mode. Add a check before assignment. Change-Id: I0610a58dbccffdba4b94140d74942c2ff60c7882 CRs-Fixed: 675176
* | | | | Merge "Camera2: Fix ANR when switching camera during AF"Linux Build Service Account2014-06-111-0/+3
|\ \ \ \ \
| * | | | | Camera2: Fix ANR when switching camera during AFVladimir Petrov2014-06-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check that 'mCameraDevice' is valid at beginning of setCameraParameters(). This will avoid null pointer exceptions at some cases, when setCameraParameters() is called by focus manager after closing camera. CRs-Fixed: 668405 Change-Id: Iff4b81e725db6db11cdc205512b0fec1f71f333d
* | | | | | Merge "Camera2: Fix flash item status incorrect when turn on/off AE-Bracket"Linux Build Service Account2014-06-111-3/+0
|\ \ \ \ \ \
| * | | | | | Camera2: Fix flash item status incorrect when turn on/off AE-Bracketkaiyiz2014-06-061-3/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The popup should not be set null when the popup is showing, which will lead to the view(popup) could not be update by application. Example: when turn on/off AE-Bracket could not disable flash item after popup is set null Don't set popup null when the popup is showing. [Reference similar code in VideoMenu] CRs-Fixed: 674423 Change-Id: Id8c5772f3504014ee6591cc16dddcacbf5325629
* | | | | | Camera2: Still popup tips when change scene to other after turn off HDRkaiyiz2014-06-101-9/+11
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toast popup or not depend on the value of hdr and scene mode, but now the value mHdrOn status is not uniform with the actual hdr value, which lead to popup toast incorrect. Get the value of scene mode or hdr from the preference directly rather than a new variable. So the mHdrOn is not used and delete it. CRs-Fixed: 674521 Change-Id: I1c6926e0ba295e9869109b7412a7413323d3bd1c
* | | | | Merge "Camera2: enable WNR in video mode"Linux Build Service Account2014-06-061-0/+7
|\ \ \ \ \
| * | | | | Camera2: enable WNR in video modeLikai Ding2014-06-061-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable WNR to reduce noise in 720P recording preview. Change-Id: I74471446b5fba0216b292f8fca81bf6e09b5d997 CRs-Fixed: 669247
* | | | | Merge "Camera2: disable the shutter button when not previewing"Linux Build Service Account2014-06-061-0/+1
|\ \ \ \ \
| * | | | | Camera2: disable the shutter button when not previewingLikai Ding2014-06-061-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera app will crash if the shutter button is clicked while not previewing. Disable the shutter button in onStopPreview() as it's called by onSurfaceTextureDestroyed(). Change-Id: Ied369610c590323b977b4ac1c3150c6c905e9466 CRs-Fixed: 669190
* | | | | Merge "Camera2: Make continuous shot only support jpeg format picture"Linux Build Service Account2014-06-061-0/+11
|\ \ \ \ \
| * | | | | Camera2: Make continuous shot only support jpeg format picturekaiyiz2014-05-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When click continuous shot, other format picture can also be chosen. Modify to acheive that when we click continuous shot,the picutre format can only be jpeg format. CRs-fixed: 671041 Change-Id: Ifb99342bff3715ea0ab1eb1061b02d342d7574e9
* | | | | | Merge "Camera: Move out TimeLapse option from global list"Linux Build Service Account2014-06-062-2/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Camera: Move out TimeLapse option from global listSuman Mukherjee2014-05-292-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimeLapse setting was common for front and back camera As there is no specific reason to have it common, to align with other settings, moved it out from common list so that Timelapse setting change in front camrea will not affect for back camera and vice versa. CRs-Fixed: 654627 Change-Id: I0b14284adc6063ccb9bf175a37644c162bb47fd5
* | | | | | Merge "Camera2: Make menu not pop up in take picture interface"Linux Build Service Account2014-06-051-3/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Camera2: Make menu not pop up in take picture interfacekaiyiz2014-05-271-3/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we click menu key in view interface and take picture interface,the menu will both pop up. Modify condition to achieve not pop up menu in take picture interface. CRs-fixed: 652961 Change-Id: Ifc2e3b4535fdf48c110673a3ec633ecdc93cc37a
* | | | | Merge "Camera2: Query support for longshot and ZSL+HDR from parameters."Linux Build Service Account2014-06-047-2/+64
|\ \ \ \ \
| * | | | | Camera2: Query support for longshot and ZSL+HDR from parameters.Sai Kumar Sanagavarapu2014-06-027-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query camera parameters to check if longshot and ZSL+HDR are supported or not. Also, add generic way of enabling/disabling preferences to facilitate features which are mutually exclusive. Change-Id: I4332e3d5050f56b1953e4c0d767eb87f7e932c49
* | | | | | Merge "Camera2: Make Continuous Shot off when HDR on."Linux Build Service Account2014-06-032-1/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Camera2: Make Continuous Shot off when HDR on.kaiyiz2014-05-282-1/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HDR function can not existed with the Continuous Shot function,so change code to achieve the function like that when we open HDR function ,make the Continuous Shot off, and we close HDR,make the Continuous Shot on. CRs-fixed: 667319 Change-Id: I75ab5d268c1feb2d95ff6a6b0f35dcf96d8cc953
* | | | | Merge "Camera2: disable ZSL setting during counting down"Linux Build Service Account2014-06-012-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Camera2: disable ZSL setting during counting downLikai Ding2014-05-292-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | During counting down, ZSL setting should not be changed by user. Add check in popup initialization as well. Change-Id: I02439aef78adaa190158452ea034fa19256f9d85 CRs-Fixed: 664691
* | | | Merge "Camera2: fix flashlight widget status error after luanch camera"Linux Build Service Account2014-06-011-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera2: fix flashlight widget status error after luanch camerakaiyiz2014-05-281-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flashlight will be initialized when we luanch camera.But flashlight widget do not know the flashlight has been turned off.So the widget's status still in turn-on. Send a broadcast to make flashlight widget know that flashlight has been closed.So the status can be right. CRs-Fixed: 670735 Change-Id: I8a6b7f49111071f23bc55c6d61b01a38d807cb57
* | | Merge "Camera2: fix unresponsive shutter button after failure"Linux Build Service Account2014-05-291-0/+1
|\ \ \
| * | | Camera2: fix unresponsive shutter button after failureLikai Ding2014-05-291-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shutter button is disabled during capture(). It's only re-enabled in onPicutreTaken() callback. If camera is switched just before counting down finishes, picture taking may fail and shutter button is left disabled. Enabling shutter button in onPreviewStarted() fixes the problem. Change-Id: I92c644e9a0d283f9ab0269b85586f27e0f4eeb1b CRs-Fixed: 667311
* | | Merge "Camera: Do not continue with long shot if SD card is full"Linux Build Service Account2014-05-291-0/+7
|\ \ \ | |/ / |/| |
| * | Camera: Do not continue with long shot if SD card is fullVijay kumar Tumati2014-05-231-0/+7
| | | | | | | | | | | | | | | | | | | | | We should not try to capture photos if SD card is full Change-Id: Iebbf5b100c5bb1a82a1016419eda7fd7bcab4c1b
* | | Camera2: Change picture format to Jpeg when start from other APKkaiyiz2014-05-251-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change menu setting of picture format to Jpeg when camera is start from other APK by intent. Crs-fixed: 662134 Change-Id: Ida20f278b5010b24d67a00c8631543f4b5b343c9
* | | Merge "Camera: Disable flash for AE-Bracket"Linux Build Service Account2014-05-242-0/+26
|\ \ \
| * | | Camera: Disable flash for AE-BracketSuman Mukherjee2014-05-222-0/+26
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main flash is high, AE bracketing requires several frames. If the LED lit up at high for long, it could be burned and cause HW damge. Fix: Flash has been disabled if AE-Bracket option is enabled with proper toast message. CRs-Fixed: 663613 Change-Id: Ic568630783309af19f7670aee563cd6eb0032fb1
* | | Merge "Camera2: Fix face eyes display incorrect when face detection is on"Linux Build Service Account2014-05-231-16/+50
|\ \ \ | |/ / |/| |
| * | Camera2: Fix face eyes display incorrect when face detection is onkaiyiz2014-05-201-16/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no difference to the eye display when in horizontal screen and vertical screen. Add operations to display eyes line in horizontal screen. CRs-fixed: 637286 Change-Id: I5337fec876b3d868de9f3ba2f1b60a54810d8226
* | | Merge "Camera: Send long shot UI button status to native drivers."Linux Build Service Account2014-05-211-0/+5
|\ \ \
| * | | Camera: Send long shot UI button status to native drivers.Vijay kumar Tumati2014-05-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to send long shot UI button status to native code to take actions appropriately. Change-Id: I8cf56f09fa33ee31ae7eb2f687d07d875e5ae6fc
* | | | Merge "Camera: Decrease downsample factor for smaller resolution"Linux Build Service Account2014-05-212-2/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera: Decrease downsample factor for smaller resolutionSuman Mukherjee2014-05-142-2/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After image capture, animation takes place with a downsampled image (by factor 4). Due to downsampling smaller resolution (QCIF and others) image size for animated thumbnail is going below the allocated size and it appeared very small. Fix: For image size of resolution CIF downwards, use downsampling factor as 2 without affecting performance for other resolution. Change-Id: I1098fc1a8f6fb880d5c36ebd2eaeec4415c75fe1 CRs-Fixed: 662891
* | | Merge "Camera: Update JPEG picture format to HAL when ZSL mode is turned on"Linux Build Service Account2014-05-161-0/+1
|\ \ \ | |/ / |/| |
| * | Camera: Update JPEG picture format to HAL when ZSL mode is turned onVijay kumar Tumati2014-05-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Without this, picture format is changed to JPEG in UI but this message is not conveyed to HAL. Change-Id: I287a684c7bb89f02f8b7c8597a8157afaf0a4da6
* | | Merge "Camera: Disable HDR when scene mode is other than auto"Linux Build Service Account2014-05-082-0/+15
|\ \ \ | |/ / |/| |
| * | Camera: Disable HDR when scene mode is other than autoSanthosh Kumar Thimmanna Bhattar2014-04-292-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-074-9/+28
|\ \ \
| * | | Camera2: Fix camera application memory leakGaoxiang Chen2014-04-244-9/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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