summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Snap: Remove CAF Chinese translationsMichael Bestas2019-10-252-492/+8
| | | | Change-Id: Icb15ed42b62a8a85a7691c5cfc606307689cbcae
* CameraActivity: Handle NPE when film strip view is nullLuK13372019-10-251-1/+3
| | | | Change-Id: I0de4ec0f2cb4653822249ea97e8a07c890fc7231
* SnapdragonCamera: Fix incorrect viewfinder ratio for 13.1MP shotsSultanxda2019-10-251-1/+1
| | | | | | Set the aspect tolerance to 0.02 to compensate for 13.1MP (4208x3120) shots. 13.1MP will now be properly registered as a 4/3 resolution when the viewfinder ratio is calculated. Change-Id: I41540a0d5fbe11f59d776a6e70e82baa463fff59
* Snap: Fall back to default quality for invalid video qualitiesMichael Bestas2019-10-251-3/+2
| | | | | | Might happen when updating from previous versions of Snap Change-Id: I42d2037b4e32c7f5c88a60b5da1895dcb761d176
* Snap: Add support for mw_continuous-picture focus modecodeworkx2019-10-254-12/+40
| | | | | | | | | | | | | | | | | | | | | | Author: codeworkx <codeworkx@cyanogenmod.org> Date: Wed Jan 6 12:25:10 2016 +0100 Snap: Add support for mw_continuous-picture focus mode Change-Id: If165370b52d7454c69e2cdeb9d837d049010b0e8 Author: Michael W <baddaemon87@gmail.com> Date: Sat Oct 22 14:47:09 2016 +0200 Snap: Fix possible NPE Seems like getSupportedFocusModes() can return null. Check for null before using it further Change-Id: I46860f780b99970cbe9857c8ba73691d69321488 Reference: BugDumps 20161014-20 L#131 Change-Id: I066a26043cc89b3037e457d8da340ed4b005ee1f
* Snap: Add support for shutter speedcodeworkx2019-10-256-0/+122
| | | | | | | | | | | | | | | | | | Author: codeworkx <codeworkx@cyanogenmod.org> Date: Wed Jan 6 11:35:40 2016 +0100 Snap: add support for shutter speed Change-Id: Id3393280c7c1c2f292d71587ba099e8dbafd1340 Author: codeworkx <codeworkx@cyanogenmod.org> Date: Fri Jan 8 19:38:15 2016 +0100 Snap: Restart preview when shutter-speed gets disabled Change-Id: I3884b23f1c855cfffeb20ca6e2a760732370d772 Change-Id: I82144c80d8fc2e7324b3dc8cde44b5b2934bdd50
* Snap: Add touch-to-focus timeout duration settingsjt11342019-10-257-5/+51
| | | | | Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065 Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
* Snap: Make openLegacy an optioncodeworkx2019-10-252-11/+40
| | | | | | | | | | | | | | | | | | | | | | | | | Using openLegacy on QCamera3 forces it to use QCamera2 and fall back to api v1 which is not what we want on v2 devices. Author: codeworkx <codeworkx@cyanogenmod.org> Date: Tue Jan 5 23:02:12 2016 +0100 make openLegacy an option Change-Id: Ia4142288ef0fafa62fa0ab855dc342b363b640cd Author: Zhao Wei Liew <zhaoweiliew@gmail.com> Date: Sun Jul 10 15:11:43 2016 +0800 Snap: Tighten openLegacy() try-catch block We only have to enclose the openLegacy() call in a try-catch block. This prevents us from re-calling open() when open() fails and throws a RuntimeException. Change-Id: I81396e453f57215338a0c4da41c4116f2b4d42ca Change-Id: Ic392a4ae9403ebae36940ddf0727237d9cb9e8f0
* Snap: Add options to restart preview onPictureTakencodeworkx2019-10-252-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: codeworkx <codeworkx@cyanogenmod.org> Date: Mon Jan 16 00:10:40 2006 +0100 Snap: Add options to restart preview onPictureTaken Change-Id: I7ce9d6f2323e367743e6d4c9662b846d3052f2a4 Author: LuK1337 <priv.luk@gmail.com> Date: Mon Jan 11 17:40:58 2016 +0100 Move mApplicationContext to init() Fixes following NPE: 01-11 17:36:42.607 4329 4391 E AndroidRuntime: FATAL EXCEPTION: Thread-235 01-11 17:36:42.607 4329 4391 E AndroidRuntime: Process: org.cyanogenmod.snap, PID: 4329 01-11 17:36:42.607 4329 4391 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'android.content.res.Resources android.content.Context.getResources()' on a null object reference 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.updateCameraParametersPreference(PhotoModule.java:3492) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.setCameraParameters(PhotoModule.java:3714) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.startPreview(PhotoModule.java:2715) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.-wrap14(PhotoModule.java) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule$OpenCameraThread.run(PhotoModule.java:265) Change-Id: I6ca0dfe402cab46dd7b6f102921062f3c7ec8d43 Author: codeworkx <codeworkx@cyanogenmod.org> Date: Fri Jan 22 17:17:53 2016 +0100 Snap: Do not restart preview during longshots Change-Id: I6ad439dc0be7c6e0d13ac7c22aacdc0ad559d051 Author: LuK1337 <priv.luk@gmail.com> Date: Sun Mar 19 10:43:33 2017 +0100 Snap: Add overlay for restarting camera preview for additional cameras Change-Id: I95eb7237b101b73d66fe231a11d0c8d5156bfe47 Change-Id: I49312aef5331bf549e38a0534b95f76a0b8bb8da
* option to set manufacturer specific parameters on startupcodeworkx2019-10-253-0/+36
| | | | Change-Id: If734a7f4c25465876e657926700763b9169d786e
* Snap: Add support for luminance-condition parametercodeworkx2019-10-253-0/+36
| | | | | | | | | | | | | | | | | | Author: codeworkx <codeworkx@cyanogenmod.org> Date: Tue Jan 5 23:54:52 2016 +0100 add support for luminance-condition parameter Change-Id: Idf845a5f55abf9b72f61ac4bac59ee2258043482 Author: codeworkx <codeworkx@cyanogenmod.org> Date: Sun Feb 21 11:17:12 2016 +0100 Snap: fix camera hang on LGE G4 when flash got used Change-Id: I23e53333a0bbe2a12e64e87ec8594aeaa503e9fc Change-Id: If1c2cd9dd253d6342de241b381152a759e8d3f05
* add support for non-standard iso keys and valuescodeworkx2019-10-253-8/+82
| | | | Change-Id: I3a948495cdf84dae3c1734d50ff91b4a5d3d9fc0
* Snap: Add support for additional ISO valuesMichael Bestas2019-10-252-0/+86
| | | | | | | | | | | | | | | | | | Author: Michael Bestas <mikeioannina@gmail.com> Date: Wed Oct 8 22:45:05 2014 +0200 Snap: Add ISO values for sony devices Change-Id: I6d76e2c02ed6222e06aaa59161b3b16e885e6462 Author: codeworkx <codeworkx@cyanogenmod.org> Date: Tue Jan 5 19:28:40 2016 +0100 add additional ISO values Change-Id: I373457adfa7c6808a1b0303f2f6b10e0b27a1ecb Change-Id: I82d11d55b96d8afd90478f08b2a1f0df056924e9
* SnapdragonCamera: Reset camera state after taking pictureSultanxda2019-10-251-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. Change-Id: Ie4bd629d9e1db1ed3e5b5f80c5b02fd000d88c8e
* Camera2: Add option to set max screen brightnessMichael Bestas2019-10-2510-3/+59
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera2: Headset shutter modeDave Daynard2019-10-253-0/+16
| | | | | | | Use play button on headset to take a picture/video/panorama Use media next/previous for zoom Change-Id: I25c22646b041e5e0941fbe361eccfe77a2a1e42f
* Camera: Handle keys only while in appMichael Bestas2019-10-253-11/+25
| | | | | | Thanks to Lars Greiss (SlimRoms) Change-Id: I63f757d25260fba4683f494f8b4daf178a2b4e13
* Camera: Cleanup hardware key handlingMichael Bestas2019-10-257-15/+102
| | | | | | | | | | | | | | | | | * 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 Bestas2019-10-2512-3/+111
| | | | | | | | | | | | | | 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
* Camera: Change volume hard key button to zoom functionSu Liu2019-10-256-5/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Su Liu <suliu@codeaurora.org> Date: Wed Sep 4 18:16:50 2013 +0800 Camera: Change volume hard key button to zoom function Able to capture image through volume hard key button in camera application, change the function to zoom function. Change-Id: Iab9fc2492b2e2ff89cd58c21bac2f147f47b77e2 Author: jt1134 <jt1134@gmail.com> Date: Sat Jan 4 20:52:27 2014 -0600 Camera2: implement volume key zoom in video mode Change-Id: I140e8cfb3e39700f60e40c35b38e92c83a3c26de Author: Lars Greiss <kufikugel@googlemail.com> Date: Sun Feb 2 03:09:22 2014 +0100 Camera2: tweak volume key zoom and cleanup - cleanup unused code - cleanup codestyle - add more zoom steps for smother zooming - show zoom circle indicator during zoom Change-Id: I5214fc2620a0c5167bfdc8e85f7115966c3b8bcf Change-Id: I99dd2fffc92985156eece67c19435a71d14cd928
* Camera: separate settings for color effectsjt11342019-10-254-4/+11
| | | | | | | | | | | | | | | | | | | | | Author: jt1134 <jt1134@gmail.com> Date: Mon Jan 20 19:45:13 2014 +0200 Camera: separate settings for color effects Store color effect settings for the camera and video camera in their own separate preferences. Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9 Author: Michael Bestas <mikeioannina@gmail.com> Date: Tue Aug 26 06:11:21 2014 +0300 Snap: Fix filtering of unsupported camcorder color effects Change-Id: I365deeb17995175db873f6799cf0cde43ee61e96 Change-Id: I7ee41923f8a7313eee06d5e0bf7e29a365d0af86
* Camera2: implement exposure compensation settings in video modejt11342019-10-254-0/+31
| | | | Change-Id: I83a2675e109dc7924cdd9240b26051ac218f532a
* Camera2: Remove CAF video duration codeMichael Bestas2019-10-2513-188/+4
| | | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2 Signed-off-by: Chippa-a <vusal1372@gmail.com>
* Camera2: some aapt warnings cleanupLars Greiss2019-10-253-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 Greiss2019-10-251-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: fix preview for landscape devicesPawit Pornkitprasan2019-10-253-9/+8
| | | | | | | | | | 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
* camera: Remove ICS hack to stop preview after takePictureSteve Kondik2019-10-251-6/+0
| | | | Change-Id: Idcecfc6399421bd5dc25dcf79548949cdd14621f
* Camera2: enable antibanding by defaultPawit Pornkitprasan2019-10-251-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: Check if video sizes are availableSteve Kondik2019-10-251-0/+4
| | | | | | | | | * Some drivers don't report video sizes and we should avoid using fine resolution lookup, otherwise a crash results. * Just honor the defined camcorder profiles. Change-Id: I83e8fe2ca9bb489332f37767906bc7c56389f949
* Camera: Add red-eye flash mode supportMichael Bestas2019-10-259-1/+11
| | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I3db982732d15fb4eb83d5e37bff1a123225d4e8e
* camera: Add all focus modes, scene modes, and color effects.Steve Kondik2019-10-256-70/+260
| | | | Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3
* Camera: Cleanup and compatibility fixesSteve Kondik2019-10-254-34/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Steve Kondik <shade@chemlab.org> Date: Sat Dec 7 06:07:02 2013 -0800 Camera: Cleanup and compatibility fixes * Don't crash for unavailable integer parameters * Kill logspam Change-Id: I6dbcf5560f96ce6173a847501721f589766889bc Author: Ryuinferno <ryuinferno.xda@gmail.com> Date: Thu Dec 26 19:11:23 2013 +0100 Camera2: More thorough compatibility fixes Certain chipsets (such as omap) have contrast, sharpness and saturation set, but no max integer given for those Change-Id: I58efaef4d0a511aefc803a440e0c3aa3dbdc9483 Author: Ethan Chen <intervigil@gmail.com> Date: Wed Feb 5 23:02:17 2014 -0800 Camera: Fix saturation, contrast, sharpness parameters * Old-style QCOM HALs use <setting>-max, new style HALs use max-<setting> for these parameters. Change-Id: I3b0dbd04f072cb69d09c44b5b3af1097560205b3 Author: Steve Kondik <shade@chemlab.org> Date: Wed Feb 26 07:43:28 2014 +0100 camera: Make some parameter lookups safer * 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 Change-Id: Id1a3e360474f0a8aebe150918d13b0a825715789
* camera: Remove the luma-adaptation seekbarSteve Kondik2019-10-252-86/+0
| | | | | | * Not useful for any hardware I have encountered. Change-Id: I93cca2b3bf907cc01946a55111de9eb883475d24
* camera: Add parameter debugging supportSteve Kondik2019-10-253-6/+24
| | | | Change-Id: Ifc1653f0046af169ba36d94796b4d9a3055c6798
* SnapdragonCamera: Hide UI after error-checking video preferencesSultanxda2019-10-251-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
* Snap: Re-enable ZSL after exiting HDR modeSultanxda2019-10-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | Author: Sultanxda <sultanxda@gmail.com> Date: Sun Aug 2 20:16:09 2015 -0700 SnapdragonCamera: Re-enable ZSL after exiting HDR mode * Make sure to check that HDR was changed before forcing ZSL back on. Change-Id: Ifb76263c3a50b919762fd2a313d6013295c0619f Author: Gabriele M <moto.falcon.git@gmail.com> Date: Tue Jan 19 16:45:25 2016 +0100 Snap: Don't enable ZSL when disabling HDR Instead, restore the default value. This prevents issues on devices that don't support ZSL. Change-Id: I9c456cd6503df29800e2bc7ccaa691cb3fb42681 Change-Id: I66c9e31f37ef09c2437fcacac6c04246dab7df3c
* SnapdragonCamera: Initialize overlay before control-by-intentSultanxda2019-10-251-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
* Snap: Remove old iconsMichael Bestas2019-10-256-9/+0
| | | | Change-Id: I07da25f50e52b4085deec1d520806afc6da5e1da
* Snap: Use AOSP app labelMichael Bestas2019-10-253-8/+6
| | | | Change-Id: I3d589945ea31f40890a94b43555268b6b3060e37
* tests: fix class nameDan Pasanen2019-10-252-2/+2
| | | | | | * fixes compile, we are not camera2 Change-Id: Ia7c463745e91ee02aa12f77c9e9d06b602692c4c
* Rename SnapdragonCamera to SnapMichael Bestas2019-10-257-13/+15
| | | | Change-Id: I1474550af7f45e53aa97819b42a91c961eeb6684
* Revert "SnapdragonCamera: Add missing permissions"Arne Coucheron2019-10-251-2/+1
| | | | | | This reverts commit 53e8b4a71dd0515d922964f1326cbd550d6229f8. Change-Id: Ife412eeab75853814389a32554a4047bf5141828
* Revert "SnapdragonCamera: Reduce number of countdown timer option"Gopal G Goberu2019-10-251-2/+2
| | | | | | This reverts commit 57d77499b09d207187c8a1051bf043ba9fb43c84. Change-Id: I91faf90357f5563e594756c0b7a942c34bbee344
* Revert "SnapdragonCamera: Forbid volume key can take picture"Michael Bestas2019-10-254-15/+2
| | | | | | This reverts commit e73e717b8be1ba834161914af4debc61c1feb8be. Change-Id: Iee719f34f6016f89ec0bb1c078bfa25c2f718436
* Revert "Remove CameraDataCallback."Chippa-a2019-10-254-0/+139
| | | | | | This reverts commit e7c3825c2ef5fca2ed70d753ea32f2c042a3fa50. Change-Id: Id18176046c657ea084eaec3ab3c1f0e51aeb12f0
* Merge 240a5a28559c5fd2e5fc54ec5bd77d73bcf9e9ea on remote branchLinux Build Service Account2019-09-212-1/+5
|\ | | | | | | Change-Id: I4a9b850e1bf061438d7812f5eccc5d78473ce13b
| * SnapdragonCamera: Add SM6250 socid 407 for burstPreview 30fpsxianming wang2019-09-162-1/+5
| | | | | | | | | | | | | | Add SM6250 socid 407 for burstPreview 30fps. CRs-Fixed: 2502149 Change-Id: I96094d7adf8e5e9bff674e2ed94e2c69cbc4aa03
* | Merge 8ea15e18847a5223ca52cb15a510aa4cf8ff923c on remote branchLinux Build Service Account2019-08-224-15/+55
|\| | | | | | | Change-Id: I89983c60930cccd5ac9108839676e5328a399ffc
| * Merge "Update vesion number to 2.02.033" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2019-08-081-1/+1
| |\
| | * Update vesion number to 2.02.033jinwu2019-07-041-1/+1
| | | | | | | | | | | | Change-Id: I3c1e060d22ca07ae780fb3149faf6c046b25df76