summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
Commit message (Collapse)AuthorAgeFilesLines
* Minimum viable Android M runtime permissions handling for H.zafir2016-08-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates new activity for permissions handling: both checking for permissions and handling error condition when critical permissions are not present. The reason for creating a new activity is so the app does not attempt to continue executing OnCreate, OnResume etc, which opens the camera while the dialogs are showing. This should not slow the app down because the permissions activity will only run when a) the first time the app has insufficient permissions and b) when a critical permission is missing and the app needs to shut down. Bug: 21273463 CRs-Fixed: 1019847 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5 (cherry picked from commit ad44cda82fe6ec5ee090115129223c6314f9e1bb) Fixes to M permissions. Previously, we called PermissionsActivity with startActivityForResult(). However, this creates race conditions as we check for permissions and the CameraActivity continues to operate. Now, we end CameraActivity and launch a new instance upon successful permissions resolution. We can also put the preload filmstrip logic back in its original place in onCreate. The checks for permissions happen in both onCreate and onResume. Bug: 22442745, 22478144, 22497152 CRs-Fixed: 1019847 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0 (cherry picked from commit ac0e2425e77a9b69e76d2f31876798825ea44584) SnapdragonCamera: Fixed M permission issue - Resolved NPE while sending permission request - Made change to request non-critical permissions once only, but the critical permssions all th time. - Removed unused contant defines CRs-Fixed: 1019847 Change-Id: Ib997244cbcc041d86c094c7ee7a902bff56e92ad snap: Remove platform signature * We are using runtime permissions now. Change-Id: I3386214dbbc0915251941ef490e7cbaf27e6ed45
* Snap: Remove storage menu if no external storage availablemaxwen2016-08-101-2/+9
| | | | | Change-Id: I9807c7f9303f17eb971ff1a82fbd35dfbdbfa529 Signed-off-by: Zdrowy Gosciu <ZdrowyGosciu+GITHUB@gmail.com>
* snap: Fixes for advanced features and scene modesSteve Kondik2016-08-031-1/+19
| | | | | | | | * Get rid of the annoying toast when longshot is disabled * Add support for ChromaFlash as a scene mode * Adjust overrides for various scene modes Change-Id: Ifda1990f4e9b3435655664f2a6c2b31fc3ae23fa
* SnapdragonCamera: implement optizoom and chromaflash UILikai Ding2016-08-031-0/+19
| | | | | | add scene mode for optizoom and preference entry for chromaflash Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
* SnapdragonCamera: Disable CDS and TNR if SeeMore is enabledShwetha Kotekar2016-07-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If seeMore is enabled, send a disable command to HAL to disable the CDS and TNR features. Change-Id: I91bac0a01c58cb13ba32296739b47f74dc296003 SnapdragonCamera: Enable SeeMore option for 4k. Currently SeeMore option for 4k recording is disabled. As per requirements, enabling the same. Change-Id: I69e84e0c20c199d80fc819f8aa6be62605bfbd79 SnapdragonCamera: Turning off CDS and TNR while SeeMore is on. Ensuring turning off of CDS and TNR while see more feature is on. Change-Id: I74c76f8b07046b8dca9db2be162b7ef20ba2d96d CRs-Fixed: 937242 Camera2: Add StillMore option in Camera app menu Add menu item for StillMore feature under the Advanced Features item during camera preview. Change-Id: I89ae260339896878ff4f1c5099885c6f3b05a18b SnapdragonCamera: Changes to enable TNR processing by default. TNR was disabled by default from UI. Change configures TNR for camera stream to improve image quality. CDS is disabled as TNR is enabled by default from now. Change-Id: I7c1bf9533c52b8642fb15f79625cec57cc85b6cf Crs-fixed: 890243 SnapdragonCamera: Checking whether SeeMore is available Checking if the preference is available. Change-Id: Ie885b9312f2fe054e272d15b9a38e2cedf756632 CRs-Fixed: 957117
* Snap: Fix incorrect default ISO values parameterZhao Wei Liew2016-07-181-1/+1
| | | | | | | | | | | | This is a typo introduced by commit: c544747c2892b3984357a86b4116e1faa2be2210 We intend to default the ISO values parameter to "iso-values", but we are currently setting the ISO parameter instead. Fix the typo. Change-Id: Icea4771767c04b08e2b888bc8fb55a05fc69fa91
* Snap: Remove face detection option if not supportedArne Coucheron2016-02-261-0/+14
| | | | | | | Removes the face detection option from preference list if the "face-detection" camera parameter is blank/doesn't exist. Change-Id: I2ec82ae38505b6674f1a34e98d1b1fb2dbc2a714
* Snap: Remove video snapshot size when not supportedMichael Bestas2016-02-201-2/+6
| | | | Change-Id: I3f4dd8b76044389ee4d0d257e47b4ac90262ccc1
* Snap: Remove auto HDR option when not supportedMichael Bestas2016-02-201-3/+8
| | | | Change-Id: Iaff1bee5ad6d48df2efe189955ba91bca8ec5c32
* Snap: Fix filtering of unsupported HFR/HSR modesMichael Bestas2016-02-171-3/+25
| | | | Change-Id: I7721613f10a24cbd36eb0a3c5b0a46a98e828679
* SnapdragonCamera: Implementing SelfieFlash featureCamera Software Integration2016-02-171-0/+2
| | | | | | | Introducing SelfieFlash feature. Change-Id: I7b73d9db585038640b715092b01e037538ef68aa CRs-Fixed: 937232
* Snap: Add focus time support in camcorderMichael Bestas2016-02-071-0/+1
| | | | Change-Id: I5432554a40d7375ed7893c38cb2741a12cc8cc80
* SnapdragonCamera: Add focus-mode option to camcorderSultanxda2016-02-071-0/+6
| | | | | | | User can now control the focus mode used while recording video. Change-Id: I340c01a3f88314de67ca024279672276eff453ed Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Revert "Camera: Propagate power mode selection from UI to lower layers."Ricardo Cerqueira2016-01-161-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5302d2e099de0ae1c3cb4a9cda993fe28b0e8c46, runtime power-mode changes are causing stability issues in camcorder Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2 Revert "SnapdragonCamera: Disable LPM if DIS/Flip are enabled." This reverts commit 6cd860119a45b4a44d3e1314981862d9dac47955. Revert "SnapdragonCamera: Set low power mode by default." This reverts commit d4fccc04331a6a5a7038a542f7d17ecefa4ac95a. Revert "SnapdragonCamera: Enable low power mode in Camera." This reverts commit 195fccbe69e92b0312822aa762bb53d301c0f56f. Change-Id: I623626e60efc850fe182e54d9e9997ca41275579 [mikeioannina]: Remove the now obsolete power mode setting and unhide the video snapshot size setting Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2
* Snap: Actually select the highest quality video by defaultChristopher R. Palmer2016-01-151-1/+8
| | | | | | | | | | | Prior to this commit Snap assumes that the HAL returns the list of supported video sizes in descending order of quality and simply picks the first one from the list as the default quality. Instead, find the first matching entry of pref_video_quality_entryvalues that the HAL indicated was supported. Change-Id: Ifea79e0e16a9015557539e098317536a32b9ff1f
* Snap: Remove touch AF/AEC optionSteve Kondik2016-01-141-7/+0
| | | | | | | * Drop the use of the touchaf-aec parameter entirely. No camera needs this anymore. Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425
* Snap: special handling of hdr-mode parameter for lge devicescodeworkx2016-01-111-0/+3
| | | | Change-Id: Iefee1f15f5649c2f93c59fcbdedcf953e9e0bc54
* Snap: Fix NPE when parameters.getSupportedVideoSizes() is nullMichael Bestas2016-01-111-97/+21
| | | | | | | | * Older devices do not support parameters.getSupportedVideoSizes() * Assume that the device reports valid profiles in media_profiles * Remove dead code Change-Id: Ic3488b6762496bd9498bc6bf8b48b2a2212bad51
* Snap: Remove dead codeMichael Bestas2016-01-091-2/+0
| | | | | | | | | | * Remove non-standard video resolutions. * Revert "camera: override shutter sound volume" commit 8a50cda8f72738e943904fdf7cae189b2b0a8ea8. Adapted from CodeAurora commit 000c6fa3b5c95297496e0ae077030132409871ea Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
* SnapdragonCamera: Add support for high-speed video recordingPraveen Chavan2016-01-071-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | [1] Use combination of MediaRecorder.setCaptureRate and setVideoFrameRate API to achieve HFR/HSR ------------------------------------------------------------ CaptureRate videoFrameRate Recorded-video ------------------------------------------------------------ 120 30 slow-mo @30fps 120 120 high-speed-video @120fps ------------------------------------------------------------ Deprecate usage of custom fields added to media-profiles for checking max-capabilities. Instead, introduce high-speed profiles and advertize correct values (resolution, fps) to indicate target capabilities. Add conversion routines in CameraSettings to convert from normal quality level to time-lapse/high-speed quality. Also, add back 4KDCI and VGA support TODO: Implement bitrate scaling if AOSP does not implement in native. Change-Id: Ic1d5ed8ef52348cab2383abe304056e0401f7069
* SnapdragonCamera: Query camcorder profiles before usageSai Kumar Sanagavarapu2016-01-071-2/+33
| | | | | | | | 1. Use generic camcorder profile query mechanism instead of hardcoding profile enums in app. 2. Fix NPE during startpreview if mFocusManager is null. Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
* Revert "SnapdragonCamera: Filter out unsupported video encoders inSusmitha Gummalla2016-01-071-33/+0
| | | | | | | | | | | | app" This reverts commit bac24e32cc1d2ff2fd5150e304b0898f449628ef. This is removing H265 encoder from the UI options, which is a FR requirement on 8994. We need to add H265 in media profiles and then commit this change. Change-Id: Id67fe2c83b12011ae82a14183ecc1ef34a38e8fb
* Snap: add support for shutter speedcodeworkx2016-01-061-0/+20
| | | | Change-Id: Id3393280c7c1c2f292d71587ba099e8dbafd1340
* add support for luminance-condition parametercodeworkx2016-01-051-0/+4
| | | | Change-Id: Idf845a5f55abf9b72f61ac4bac59ee2258043482
* add support for non-standard iso keys and valuescodeworkx2016-01-051-1/+65
| | | | Change-Id: I3a948495cdf84dae3c1734d50ff91b4a5d3d9fc0
* SnapdragonCamera: Fix compilationShuzhen Wang2016-01-021-15/+2
| | | | | | | | | | 1. Address compilation due to compiler upgrade. 2. Comment out video dependencies to enable camera. 3. Fix compilation issue due to IMountService interface change. 4. Comment out ExtendedFace. 5. Remove non-standard video resolutions. Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
* 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-201-0/+1
| | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065
* Snap: Remove CAF beautification featureMichael Bestas2015-09-201-8/+0
| | | | | | | | | | | | 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: Cleanup video profile handlingMichael Bestas2015-09-171-35/+8
| | | | | | | | | | | | | | * 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
* Camera: remove fine/normal/superfine jpegquality and use always intLars Greiss2015-09-171-1/+18
| | | | | | | | | | | 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-171-0/+1
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera: Cleanup hardware key handlingMichael Bestas2015-09-171-0/+4
| | | | | | | | | | | | | | | | | * 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-171-0/+4
| | | | | | | | | | | | | | 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: separate settings for color effectsjt11342015-09-171-0/+1
| | | | | | | Store color effect settings for the camera and video camera in their own separate preferences. Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9
* Camera2: Remove CAF video duration codeMichael Bestas2015-09-171-20/+0
| | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
* 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: Fix saturation, contrast, sharpness parametersEthan Chen2015-09-171-3/+3
| | | | | | | * 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-171-3/+6
| | | | | | | Certain chipsets (such as omap) have contrast, sharpness and saturation set, but no max integer given for those Change-Id: I58efaef4d0a511aefc803a440e0c3aa3dbdc9483
* 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 all resolutions, focus modes, scene modes, and color effects.Steve Kondik2015-09-171-4/+2
| | | | Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3
* camera: Cleanup and compatibility fixesSteve Kondik2015-09-171-0/+12
| | | | | | | * Don't crash for unavailable integer parameters * Kill logspam Change-Id: I6dbcf5560f96ce6173a847501721f589766889bc
* Validate preview format before setting it to camera device.Santhosh Kumar H E2015-08-291-0/+9
| | | | | | | | | For 720p and 1080p video resolutions, nv12_venus preview format is being set. But few targets doesn't support this preview format. So validate the preview format with supported list before setting it to camera device. Change-Id: I29b3b2b412b04abf82c61c732414e00aa1bff243
* SnapdragonCamera: customize camera picture qualitylikaid2015-04-091-5/+5
| | | | | | | regional feature Change-Id: I4c80b4970ff4f628080cad20980aa545add6fdcf CRs-Fixed: 815630
* SnapdragonCamera: [Smartfren] The Storage position should be SD card.likaid2015-04-081-0/+25
| | | | | | | | | | | | The app doesn't not eanble this funtion for setting SD card as the default storage postion in Smartfren. Check persist.env.camera.saveinsd overlay flag at Smartfren mode, when sdCard is writeable, set sdCard as default storage for the first time. Change-Id: Ia71e5d97a78da121a8bccfcd0032928a17566023 CRs-Fixed: 815639
* SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-231-0/+8
| | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* SnapdragonCamera: Set highest supported video resolution by default.Sai Kumar Sanagavarapu2015-02-271-6/+3
| | | | | | | Instead of defaulting to CIF, set the highest supported video resolution as the default video profile. Change-Id: I6cb1eab905d193cbc03f528d0fbc81f5af49ab89
* SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-2/+12
| | | | | | | | Add a scene mode for refocus. If the latest photo is taken with refocus, user can click on the preview thumbnail, then refocus it by tapping on the photo. Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
* SnapdragonCamera: Add HVGA (480x360) video quality.Sai Kumar Sanagavarapu2014-12-131-0/+1
| | | | | | Add support for HVGA (480x360) video quality in camcorder settings. Change-Id: I3fd2bf4c266f2068cbe83301184d421e9278928e