summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Filter duplicate picture resolution" into ↵Camera Software Integration2016-06-201-1/+1
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Filter duplicate picture resolutionByunghun Jeon2016-06-091-1/+1
| | | | | | | | | | | | | | | | | | Filter picture resolution with duplicate name. There can be 2 different picture resolutions with the same name. Take only the first one. Change-Id: I9a472d958b829d3dce9559d4fcacb5d0dfd3e598 CRs-Fixed: 1025767
* | Merge "SnapdragonCamera: Fix initial camera id" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-201-5/+0
|\|
| * SnapdragonCamera: Fix initial camera idByunghun Jeon2016-06-091-5/+0
| | | | | | | | | | | | | | | | Fix initial camera id to proper value. Previously it was always using 0 as initial id Change-Id: Ifc8d63ba2bccb4afcc25445d6713e28732e7deb4 CRs-Fixed: 1018118
* | Merge "SnapdragonCamera: Fixed M permission issue" into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-101-0/+2
|\ \
| * | SnapdragonCamera: Fixed M permission issueJay Wang2016-06-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge "SnapdragonCamera: Using reflection to remove compilation error" into ↵Linux Build Service Account2016-06-101-1/+7
|\ \ \ | |_|/ |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Using reflection to remove compilation errorSanjeev Garg2016-06-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: Currently the camera app is being used across multiple PLs, which are on different android versions (Android M, N). There are different variables being used for h256 across different android framework - M and N. Hence using one variable name is causing compilation error in other android version Fix: Using java reflection to access variables to avoid any compilation dependency on different android versions CRs-Fixed: 1015477 Change-Id: I68519223dbe9825e8b1a7f5d1a8e509713a743c6
| * | Revert "Revert "Revert "SnapdragonCamera: Update encoder from H265 to HEVC"""Camera Software Integration2016-06-031-1/+1
| |/ | | | | | | | | | | This reverts commit dba00aac4e44a91bc55b0aabca9f191d03994edf Change-Id: I9a34c8640f26f16b6b30e36af7a3ab7a5c4e1b03
| * Revert "Revert "SnapdragonCamera: Update encoder from H265 to HEVC""Camera Software Integration2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | Resinstating Change-Id: Ib17de6f778166f3a7cb7b8e403a9b3c7fb0b3f0c CRs-fixed: 1015477 This reverts commit e8d4ba774d224e5076576ba4c29d1fc248456b40 Change-Id: I9dd2dc05068e73edd9bad617480cff5c77015b58
* | Merge "SnapdragonCamera: Update settingsManager and add Dual mode to Scene ↵Camera Software Integration2016-06-071-8/+2
|\ \ | | | | | | | | | mode" into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Update settingsManager and add Dual mode to Scene modeByunghun Jeon2016-05-311-8/+2
| | | | | | | | | | | | | | | | | | | | | Update settingsManager and add Dual mode to Scene mode Change-Id: I508430840c3fb8c7d0b56a2a63e09b271754fcb4 CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Add SettingsManager, scene, and filter" into ↵Camera Software Integration2016-06-071-7/+13
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-311-7/+13
| |/ | | | | | | | | | | | | | | | | | | | | Add SettingsManager to work as a database for settings. It will handle all dependencies and populate the values. Add scene mode and filter. Restructure UI and menu by combining them and leave the handling of settings to SettingsManager Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88 CRs-Fixed: 1018118
| * Revert "SnapdragonCamera: Update encoder from H265 to HEVC"Camera Software Integration2016-05-311-1/+1
| | | | | | | | | | | | This reverts commit 08f68a1e4d05ae996f6bf42c83d692a182a8f34b Change-Id: I659dd68861b30b6d79545ba3574320b63e4c4196
| * SnapdragonCamera: Update encoder from H265 to HEVCSusmitha Gummalla2016-05-131-1/+1
| | | | | | | | | | | | | | | | Update Camera setting to use HEVC instead of H265 as per latest AOSP changes CRs-fixed: 1015477 Change-Id: Ib17de6f778166f3a7cb7b8e403a9b3c7fb0b3f0c
* | SnapdragonCamera: disable instant capture in some cases.Jay Wang2016-05-261-6/+4
|/ | | | | | | | | | | 1. Disable instant capture when ZSL is off or advanced features are enabled 2. Change the instant capture option to support the selection of aggressive AEC and fast AEC CRs-Fixed: 998509 Change-Id: I60f7ed3a0fc93627dbf7527fbec2a60605aad683
* SnapdragonCamera: Temp fix to make both M and N compileLida Wang2016-04-301-1/+1
| | | | | | Temp fix to make app compile on both Android M and N CRs-fixed: 1007835 Change-Id: Ia3abac6d157b8e52d0998733e0a2dfbe194e0e94
* SnapdragonCamera: Add support for ClearSight captureCullum Baldwin2016-04-121-0/+1
| | | | | | | Add support to capture ClearSight images. CRs-Fixed: 993611 Change-Id: Ifaeafa53ee5d095fe322e48f968cdeec03c64077
* SnapdragonCamera: Camera2 add dual cameraByunghun Jeon2016-03-301-0/+1
| | | | | | | Add Camera2 dual camera support to SnapdragonCamera CRs-Fixed: 989750 Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e
* SnapdragonCamera: Add Camera2 modeByunghun Jeon2016-03-301-0/+3
| | | | | | | Use camera2 API to show preview and take snapshot CRs-Fixed: 989750 Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
* SnapdragonCamera: Add the developer option for instant captureJay Wang2016-03-181-0/+22
| | | | | | | | | | | | A developer option is added to support instant capture feature in the camera HAL. Once option is enabled, Snapdragon camera application will take a snapshot as soon as it is resumed from the lock screen by pressing power button twice. For this to work, user also needs to enable "Press power button twice for camera" under display setting. Change-Id: I84794759ee1edc9424c37b71bd0c2b761a77bee1 CRs-Fixed: 970691
* SnapdragonCamera: Color Effect shows the current statusJack Yoo2016-01-241-0/+1
| | | | | | | Let the icon shows the current status of the color effect on/off Change-Id: I1c3719db15d4dd920b89591064cda372c7ab89be CRs-Fixed: 951550
* SnapdragonCamera: Adding help screen on first startJack Yoo2016-01-201-0/+2
| | | | | | | Adding menu help screen. Change-Id: I8f88a20b0c3599bfa35040e66562ced012d6213d CRs-Fixed: 951551
* SnapdragonCamera: Implementing SelfieFlash featureCamera Software Integration2015-12-221-0/+2
| | | | | | | Introducing SelfieFlash feature. Change-Id: I7b73d9db585038640b715092b01e037538ef68aa CRs-Fixed: 937232
* SnapdragonCamera: add video snapshot size optionByunghun Jeon2015-10-291-6/+11
| | | | | | | | Add developer option to choose video snapshot size. The "Auto" option will revert back to old behavior of choosing the largest size with the same aspect ratio as the preview. Change-Id: Ice68aef1963c1199d30e1edde4cccf7203f8fbbf
* Revert "SnapdragonCamera: Use floating components during video record."Byunghun Jeon2015-10-291-2/+0
| | | | | | This reverts commit 59b05fd1d75943f037aec41def16cdceb6443ecf. Change-Id: I807bdbf0fe669a989d58484ab11451c891acaf5b
* SnapdragonCamera: re-enable H265 encodingPraveen Chavan2015-10-291-1/+1
| | | | | | Enable H265 video format Change-Id: Id307c98ad9cf09b71194dc38f2fbdfd11328a241
* SnapdragonCamera: Query encoder capabilities for unsupported profiles.Sai Kumar Sanagavarapu2015-10-291-4/+4
| | | | | | | Query encoder capabilities like max fps, width, height ,etc and based on this result enable/disable certain profiles/hfr modes. Change-Id: Ib5adf74eaa8d50f9ed8337a88932527624727cd4
* SnapdragonCamera: Add support for high-speed video recordingSurajit Podder2015-10-291-4/+48
| | | | | | | | | | | | | | | | | | | | | | [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 (ersolution, fps) to indicate target capabilities TODO: check against high-speed profile to check if a given {resolution, fps} is supported Add conversion routines in CameraSettings to convert from normal quality level to time-lapse/high-speed quality. Also, add back 4KDCI and VGA support Change-Id: Ic1d5ed8ef52348cab2383abe304056e0401f7069
* SnapdragonCamera: Fix compilationJaimin Bhise2015-10-291-17/+7
| | | | | | | | | | | | 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. 6. Revert "camera: override shutter sound volume" commit 8a50cda8f72738e943904fdf7cae189b2b0a8ea8. Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
* Merge "SnapdragonCamera: Add QHD and 2K video qualities."Linux Build Service Account2015-10-261-0/+2
|\
| * SnapdragonCamera: Add QHD and 2K video qualities.Sanjeev Garg2015-09-271-0/+2
| | | | | | | | | | | | | | Adding video qualities QHD (2560x1440) and 2K (2048x1080) Change-Id: Ie1500d61d2614a3cfd542f7a298c92a3208c4c7b
* | SnapdragonCamera: Add noise reduction modes.Neelam Abhinav Karthik2015-09-281-0/+18
|/ | | | | | - Add menu for noise reduction modes Change-Id: Ie5cd6590e08938fb8fbb668ac1b48aac5fe801c3
* SnapdragonCamera: Use floating components during video record.Jay Wang2015-09-161-0/+2
| | | | | | | | During recording, there are only 2 widgets on UI. Directly attaching them to window manager and making main UI layer fully transparent can reduce power consumption. Change-Id: I8c4f4768ab91d50fc72080f0f6d7316ee2e60ef4
* SnapdragonCamera: implement optizoom and chromaflash UILikai Ding2015-05-271-0/+19
| | | | | | add scene mode for optizoom and preference entry for chromaflash Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
* SnapdragonCamera: add touch animation for refocusLikai Ding2015-04-271-0/+2
| | | | | | also added a dialog to explain refocus mode Change-Id: I8c319c2cb64ca85d320eca453ade9c325fd4ac37
* Merge "SnapdragonCamera: customize camera picture quality"Linux Build Service Account2015-04-151-5/+5
|\
| * SnapdragonCamera: customize camera picture qualitylikaid2015-04-081-5/+5
| | | | | | | | | | | | | | regional feature Change-Id: I4c80b4970ff4f628080cad20980aa545add6fdcf CRs-Fixed: 815630
* | SnapdragonCamera: [Smartfren] The Storage position should be SD card.likaid2015-03-311-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-201-0/+8
| | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* Camera2: Add StillMore option in Camera app menuShwetha Kotekar2015-03-101-0/+11
| | | | | | | Add menu item for StillMore feature under the Advanced Features item during camera preview. Change-Id: I89ae260339896878ff4f1c5099885c6f3b05a18b
* 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
* SnapdragonCamera: Fix compatibility issues with KK.Sai Kumar Sanagavarapu2014-11-261-3/+34
| | | | | | | | | 1. Remove openLegacy call to open camera. 2. Use generic camcorder profile query mechanism instead of hardcoding profile enums in app. 3. Fix NPE during startpreview if mParameters is null. Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-1/+1
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* SnapdragonCamera: Add support for manual 3A params.Sai Kumar Sanagavarapu2014-11-071-0/+87
| | | | | | | | | | | | | | | | Add UI support to take inputs from user for the following 3A paramters 1. Manual focus : a. Scale mode 0-100 b. Diopter mode 0-10 2.White balance: a. CCT b. RGB gains 3. Exposure control a. ISO b. exposure time Change-Id: I92ea3719fa2224e02943bb2191987c7654aaf9ea
* SnapdragonCamera: Filter out unsupported video encoders in appSanthosh Kumar Thimmanna Bhattar2014-10-271-0/+32
| | | | | | | | | - Unsupported encoders are listing in video encoders list in camera application. - Added filter to remove unsupported video encoders from the list. Change-Id: I88b680bdd199bfe9540388129846ef0168e702bc
* Camera2: Add Multi-touch UI and control in apps.Santhosh Kumar Thimmanna Bhattar2014-10-271-0/+11
| | | | | | Changes to support multi-touch focus feature in application Change-Id: I3dc0f3bf5cd71554856a00795e82d52f36066eeb