summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Camera2: Prevent propogating CancelAutoFocus during Video Recordingcm-12.1Dheeraj CVR2015-09-201-1/+0
| | | | | | | | | | When AutoFocus is started during Video Recording, CancelAutoFocus is called after KEY_FOCUS_TIME seconds. CancelAutoFocus has the side effect of resetting the sensor AF position and will result in instant loss of focus which is not a desired event when AF is manually triggered in case of Video Recording. Change-Id: Icee7f6dfd4ad083c9b383ee2a4df6a34e4668de6
* Camera2: Prevent autofocus when video snapshot is in progressDheeraj CVR2015-09-201-1/+1
| | | | | | | | | During video recording if screen is tapped repeatedly, autofocus is started while the snapshot is taken. This would either result in an out of focus snapshot which would also disturb the focus in the recorded video or crash the sensors that can't handle autofocus during snapshot. Change-Id: If2763094f5ab7536e4409469276de54580e803c8
* camera: Touch focus support for camcorderSteve Kondik2015-09-205-10/+198
| | | | | | | | | * Available when video snapshots are not supported. * Original from CodeAurora Forum. Sultanxda: Adapted to Snapdragon Camera Change-Id: I232c178430db08e7366aa9f91b4926d07e7c225d
* Snap: Fix filtering of unsupported camcorder color effectsMichael Bestas2015-09-201-0/+6
| | | | Change-Id: I365deeb17995175db873f6799cf0cde43ee61e96
* Snap: Add touch-to-focus timeout duration settingsjt11342015-09-207-5/+57
| | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065
* Snap: Remove CAF beautification featureMichael Bestas2015-09-2025-1423/+41
| | | | | | | | | | | | Revert "SnapdragonCamera: Move the files to the correct location" This reverts commit c25b2d510285512dbb60547353190433f1dbb984. Revert "SnapdragonCamera: Add beautification feature to SnapdragonCamera." This reverts commit c1cea7c15b2e463f37c17f2a4ce61ce689ec7088. Change-Id: If01e4f438a58e4210a3eddf090d426895ecbae87
* Snap: Add ISO values for sony devicesMichael Bestas2015-09-202-0/+42
| | | | Change-Id: I6d76e2c02ed6222e06aaa59161b3b16e885e6462
* Snap: Cleanup qcom string resourcesMichael Bestas2015-09-205-1069/+710
| | | | | | | | | | | * Remove tons of unused strings * Make some strings shorter to fit better in the settings popup * 'Off' should be always the first option, else the app behaves unexpectedly * Use consistent strings for all on/off options * Replace string references to entryvalues for all qcom options with the actual parameters * Group arrays & strings based on the option Change-Id: I092ce765013e7a80a2928df8e7d1b7e7bfd67905
* Snap: Fix NPE when switching video effects and click on screenjumoog2015-09-191-2/+5
| | | | * Check if mMenuLayout is null, like in 23901e48 for PhotoUI
* SnapdragonCamera: Reset camera state after taking pictureSultanxda2015-09-191-0/+5
| | | | | | mCameraState gets stuck to SNAPSHOT_IN_PROGRESS after taking a picture using autofocus/not ZSL, thus breaking camera capture. Properly reset the camera state after taking a picture to fix this.
* AndroidManifest formatting cleanupSpike Sprague2015-09-191-2/+2
| | | | Change-Id: I279e764987fea743aa78575748a831e31ba28c0c
* Snap: Remove old iconsMichael Bestas2015-09-196-7/+0
| | | | Change-Id: I07da25f50e52b4085deec1d520806afc6da5e1da
* Snap: Add placeholder color effect thumbnailsMichael Bestas2015-09-171-0/+7
| | | | | | * Fix crashes Change-Id: Ie15d74f1444b39341b5a2968c8c84d1a9ac85537
* Snapdragon : Changes to add more HFR values in camera UI.Guruprasad Gaonkar2015-09-172-0/+4
| | | | | | 240fps is added to HFR camera UI options. Change-Id: I01076e545736670eb0761cc5d7bea1dde197bb66
* SnapdragonCamera: Quick icon disappear after stop record by home keykaiyiz2015-09-171-0/+1
| | | | | | | | | | | | | | Color effect and switch camera icons disappear if re-launch camera after press home key during recording video. The icons are hided when start record video, but show icons aren't called after stop video record by press home key. Show and hide icons should always be called when stop and start record video, so move the functions to stopVideoRecord and startVideoRecord. Change-Id: Ie4fe9102e226452502fcc382329cc0e01799b0cf CRs-Fixed: 777114
* Snap: Cleanup video profile handlingMichael Bestas2015-09-175-73/+52
| | | | | | | | | | | | | | * Fix camcorder crashes on older devices Revert "SnapdragonCamera: Fix compatibility issues with KK." This reverts commit 0d33346534a728a1f8efaec05fcdccbe3e5440e1. Revert "SnapdragonCamera: Throw error popup for unsupported video profile." This reverts commit 3e50703cff0bc243b922a2299c58a45a4cbd91a9. Change-Id: I1152180a590650a7583430936f3759d1831e91dd
* Snap: fix NPE if device doesn't support AE bracketingLuca Stefani2015-09-171-2/+2
| | | | Change-Id: I44a19b1508cb58a4f249dd00bc9038a069f9db62
* Snap: Add placeholder scene mode thumbnailsMichael Bestas2015-09-171-6/+45
| | | | | | * Fix crashes Change-Id: I4887af0a405079b4aa858c6bf57b14a7efb837c8
* Camera: remove fine/normal/superfine jpegquality and use always intLars Greiss2015-09-174-60/+23
| | | | | | | | | | | We use now a set of int values the user can exactly assign. Showing as well the normal fine superfine as choice is just a duplicate. As well we can get rid of the weird converts of the mixed values. To take care that the user does not get into problems we updated the db version and we make a convertion. Change-Id: I2615666bc1c929c0c045840fad1ece55fb0640af
* Camera2: Add option to set max screen brightnessMichael Bestas2015-09-1710-3/+56
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera2: Headset shutter modeDave Daynard2015-09-173-0/+16
| | | | | | | Use play button on headset to take a picture/video/panorama Use media next/previous for zoom Change-Id: I25c22646b041e5e0941fbe361eccfe77a2a1e42f
* Camera2: tweak volume key zoom and cleanupLars Greiss2015-09-174-43/+27
| | | | | | | | | - cleanup unused code - cleanup codestyle - add more zoom steps for smother zooming - show zoom circle indicator during zoom Change-Id: I5214fc2620a0c5167bfdc8e85f7115966c3b8bcf
* Camera: Handle keys only while in appMichael Bestas2015-09-173-11/+25
| | | | | | Thanks to Lars Greiss (SlimRoms) Change-Id: I63f757d25260fba4683f494f8b4daf178a2b4e13
* Camera: Cleanup hardware key handlingMichael Bestas2015-09-176-15/+100
| | | | | | | | | | | | | | | | | * Fix power shutter behaviour in camcorder mode * Disable volume change while in panorama mode, volume buttons should only handle camera operations while in the camera * Add camera/power/volume key shutter handling in panorama mode On devices with a hardware camera key: * Disable power & volume shutter features * Volume buttons control the zoom On devices without a hardware camera key: * When power shutter is disabled, volume buttons control the shutter (like AOSP) * When power shutter is enabled, volume buttons control the zoom Change-Id: I141946d5b6f5aec8b1e9a9f99270d30295596079
* Camera: Powerkey shutter (2/2)Michael Bestas2015-09-1712-3/+110
| | | | | | | | | | | | | | Ported from cm-10.1 Including cm-10.1 camera commit: aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization. Includes http://review.cyanogenmod.org/56986 [mikeioannina]: Updates for L Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
* Camera2: implement volume key zoom in video modejt11342015-09-172-0/+25
| | | | Change-Id: I140e8cfb3e39700f60e40c35b38e92c83a3c26de
* Camera: Change volume hard key button to zoom functionSu Liu2015-09-174-5/+80
| | | | | | | | Able to capture image through volume hard key button in camera application, change the function to zoom function. Change-Id: Iab9fc2492b2e2ff89cd58c21bac2f147f47b77e2
* Revert "SnapdragonCamera: Forbid volume key can take picture"Michael Bestas2015-09-173-10/+1
| | | | | | This reverts commit e73e717b8be1ba834161914af4debc61c1feb8be. Change-Id: Iee719f34f6016f89ec0bb1c078bfa25c2f718436
* Camera: separate settings for color effectsjt11342015-09-174-5/+6
| | | | | | | Store color effect settings for the camera and video camera in their own separate preferences. Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9
* Camera2: implement exposure compensation settings in video modejt11342015-09-174-0/+31
| | | | Change-Id: I83a2675e109dc7924cdd9240b26051ac218f532a
* Camera2: Remove CAF video duration codeMichael Bestas2015-09-176-74/+1
| | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
* Camera2: some aapt warnings cleanupLars Greiss2015-09-173-68/+0
| | | | | | | during the move from Gallery2 into new Camera2 package some unused values were moved as well. Remove them Change-Id: I4a514c76ccc70c61bb0a97ecafda7e1f9ede9f35
* Camera2: Don't report incorrect supported picture formatsLars Greiss2015-09-171-1/+1
| | | | | | | | | | | If camera HAL does not return valid picture formats do not show wrong defaults Currently it falls back to jpeg and raw to choose for the user. All our devices which do not have a proper return of picture format only support jpg. So remove the entry to choose in this case completely Change-Id: Ib4e4094ba0a57e7751f6568f6ec3c3f1dfc1ffb8
* camera: Make some parameter lookups saferSteve Kondik2015-09-171-21/+45
| | | | | | | | * Unsupported parameters that return int values will throw an exception at the framework level if they aren't supported. Handle this better and prevent crashes. Change-Id: If5a3807dba33167ef95e4ec9e9cbeb15ed4ed591
* Camera: Fix saturation, contrast, sharpness parametersEthan Chen2015-09-172-6/+6
| | | | | | | * Old-style QCOM HALs use <setting>-max, new style HALs use max-<setting> for these parameters. Change-Id: I3b0dbd04f072cb69d09c44b5b3af1097560205b3
* Camera2: More thorough compatibility fixesRyuinferno2015-09-172-6/+12
| | | | | | | Certain chipsets (such as omap) have contrast, sharpness and saturation set, but no max integer given for those Change-Id: I58efaef4d0a511aefc803a440e0c3aa3dbdc9483
* Camera: fix preview for landscape devicesPawit Pornkitprasan2015-09-173-9/+9
| | | | | | | | | | Landscape devices have broken preview because PORTRAIT mode is being abused to check for screen rotation. Use proper rotation check to fix. Ported from cm-10.2 Change-Id: I75588cbce9843e180e4be7591f6a43bcec788506
* Camera2: Preview needs to be stopped when changing resolutionPawit Pornkitprasan2015-09-171-0/+6
| | | | | | | | This was done in startPreview as a hack, but was removed in f729b85e12cfa2674048d8cce2f724014b8fc910. Specifically add it back when the resolution is changed. Change-Id: I306abd788bafdff4e6fba7eec4e6ff05bb3cc47c
* camera: Remove ICS hack to stop preview after takePictureSteve Kondik2015-09-171-6/+0
| | | | Change-Id: Idcecfc6399421bd5dc25dcf79548949cdd14621f
* Camera2: enable antibanding by defaultPawit Pornkitprasan2015-09-171-1/+1
| | | | | | | | | | | The default for antibanding should be "auto", otherwise there will be banding effect when taking photos in certain lighting. Normally, the default on most devices is "auto" (depends on Camera HAL). But the code from CAF changed it so that the Camera app explicitly change it to "off". Change-Id: Id0c2ef6e17bac74d22e12213ab2ed26c1c73783d
* camera: Proper fix for the missing video-sizes issueSteve Kondik2015-09-171-2/+5
| | | | | | * Just honor the defined camcorder profiles. Change-Id: I83e8fe2ca9bb489332f37767906bc7c56389f949
* camera: Check if video sizes are availableSteve Kondik2015-09-171-2/+3
| | | | | | | * Some drivers don't report video sizes and we should avoid using fine resolution lookup, otherwise a crash results. Change-Id: I8010e66d1a3a5e6f8a505ff3b50146cd24fc2b9c
* Camera: Add red-eye flash mode supportMichael Bestas2015-09-179-1/+11
| | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I3db982732d15fb4eb83d5e37bff1a123225d4e8e
* camera: Add all resolutions, focus modes, scene modes, and color effects.Steve Kondik2015-09-176-86/+320
| | | | Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3
* camera: Remove the luma-adaptation seekbarSteve Kondik2015-09-172-92/+0
| | | | | | * Not useful for any hardware I have encountered. Change-Id: I93cca2b3bf907cc01946a55111de9eb883475d24
* camera: Cleanup and compatibility fixesSteve Kondik2015-09-174-29/+67
| | | | | | | * Don't crash for unavailable integer parameters * Kill logspam Change-Id: I6dbcf5560f96ce6173a847501721f589766889bc
* camera: Add parameter debugging supportSteve Kondik2015-09-173-6/+26
| | | | Change-Id: Ifc1653f0046af169ba36d94796b4d9a3055c6798
* SnapdragonCamera: Hide UI after error-checking video preferencesSultanxda2015-09-171-1/+2
| | | | | | | | | | * Hiding the UI before error-checking the video preferences when video recording starts results in a broken UI when one of the error cases evaluates to be true. * Hide the UI after the error checking to prevent the UI from breaking when an error is found. Change-Id: Ia98798dbf2a33800d47497630714af17865767c6
* SnapdragonCamera: Re-enable ZSL after exiting HDR modeSultanxda2015-09-171-0/+4
| | | | | | * Make sure to check that HDR was changed before forcing ZSL back on. Change-Id: Ifb76263c3a50b919762fd2a313d6013295c0619f
* SnapdragonCamera: Initialize overlay before control-by-intentSultanxda2015-09-171-1/+1
| | | | | | | | * initializeControlByIntent() expects mVideoMenu to not be null and initializeOverlay() initializes mVideoMenu when it isn't null * Change the order the functions are called to prevent possible NPE Change-Id: I6d240892f3bd318031983243760d87ab46b25edb