summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/SettingsManager.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2" into ↵Camera Software Integration2016-12-221-0/+5
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2yingrenw2016-12-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Description: Solve the HFR Crash on 720 120FPS with Camera 2 when recording. Nullpointer crash. CaptureRequest native data copy don't have the tag data. Confirm the tag data can be copied. Change-Id: I745a09b789864db9cdbbe5cfcc8bcbc941e01bf3 CRs-Fixed: 1099749
* | SnapdragonCamera: Fix don`t save the value about focus distancemingwax2016-12-131-6/+31
|/ | | | | | | | Don`t save the focus distance value when the user change the value. Add code for saving the value in xml when the user change the value. CRs-Fixed: 1095942 Change-Id: Ic2b88d67d068c17afcc12546028e99454070b8ab
* SnapdragonCamera: Show label and dialog when switch to new scene modeweijiew2016-12-051-0/+11
| | | | | | | Show label and instructional dialog when switch to new scene mode Change-Id: I75becaa9bb898ca9ef68c94b1195069131745f14 CRs-Fixed: 1091210
* Merge "SnapdragonCamera: Selfie mirror doesn't work when open the Continuous ↵Camera Software Integration2016-11-281-0/+4
|\ | | | | | | shot" into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Selfie mirror doesn't work when open the Continuous shotweijiew2016-11-181-0/+4
| | | | | | | | | | | | | | | | Selfie mirror doesn't support continuous shot. Disable continuous shot when selfie mirror is turned on Change-Id: I4e17895f0b15d04dd6f0f56eae17f091104e3a59 CRs-Fixed: 1086429
* | Merge "SnapdragonCamera: Add ProMode" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-281-9/+30
|\ \ | |/ |/|
| * SnapdragonCamera: Add ProModeByunghun Jeon2016-11-141-9/+30
| | | | | | | | | | | | | | | | Add ProMode. User can change iso, white balance, exposure, and focus mode using this new scene mode Change-Id: I58885d3a05d6d9e8264e58cb8c4de2e1f13646b0 CRs-Fixed: 1089100
* | Merge "SnapdragonCamera: Fix camera can`t enter setting in pattern lock" ↵Camera Software Integration2016-11-151-1/+2
|\ \ | |/ |/| | | into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix camera can`t enter setting in pattern lockmingwax2016-11-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RootCause: Missing flag of WindowManager.LayoutParames in SettingsActivity.java and SceneModeActivity.java. Solution: (1) Add windowManager.LayoutParams.FLAG_SHOW_WHEN _LOCKED in SettingsActivity.java and SceneModeActivity.java. (2) Change SettingsManager`s single instance, and guarantee SettingsManager only one instance. (3) When SettingsActivity.java and SceneModeActivity.java is invisible status, finish them and ensure data is updated in a timely manner. Change-Id: I3ac24b9b181055382849550e585d3be726e71595 CRs-Fixed: 1084871
* | SnapdragonCamera: Scene mode changeJack Yoo2016-11-091-7/+7
| | | | | | | | | | | | | | | | Adding Sharpshooter, Stillmore scene mode menu Moving Tracking focus to the scene mode Change-Id: I5afb2499e767d90f0e0e6408168961bcda4e55bb CRs-Fixed: 1083651
* | SnapdragonCamera: FR36364 Restore Defaultsweijiew2016-11-071-0/+26
| | | | | | | | | | | | | | Restore all of the camera settings to defaults Change-Id: Icebc84a165a1fabee2075daa9b4e99695204cc19 CRs-Fixed: 1084321
* | SnapdragonCamera: Adjust video encoder bit rate and add 60fps supportJay Wang2016-11-071-0/+49
| | | | | | | | | | | | | | | | - Configure the video encoder bit rate to the recommended value - Add 60fps video frame rate support Change-Id: I477487c4c4fab5479534896d90e08c3eadddc54f CRs-Fixed: 1074187
* | SnapdragonCamera: run-time updates the video encoder listJay Wang2016-11-071-169/+140
|/ | | | | | | | | | | Update the supported video encoder list based on video resolution. In addition, re-factor the run-time filtering of HFR list to follow the same approach. Finally, simplify the beautification dependency handling logic by fixing the supported video resolution to 720x480. CRs-Fixed: 1081552 Change-Id: I32b96f7ccf152ddf01400e9564e072e1bf1b68d1
* Merge "SnapdragonCamera: Fix settingmanager redeye filtering bug" into ↵Camera Software Integration2016-11-021-6/+0
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix settingmanager redeye filtering bugByunghun Jeon2016-10-211-6/+0
| | | | | | | | | | | | | | | | Redeye reduction filtering logic is wrong due to mistake while rebasing. Change-Id: Ifd5c5d43f3b95f6b61c57e409b578ae713bf6ead CRs-Fixed: 1066519
* | SnapdragonCamera: Blurbuster filterJack Yoo2016-10-201-0/+4
|/ | | | | | | Adding blurbuster filter to the post processor Change-Id: I2958a2b1b0df834c4cb5b921e49d21d2e20c8377 CRs-Fixed: 1080317
* SnapdragonCamera: Disable HFR when video size is not supportedByunghun Jeon2016-10-131-0/+19
| | | | | | | Disable HFR menu when selected video size is not supported Change-Id: I295ccb5bb6dd5b2981e771914e95bf1f238f2dbb CRs-Fixed: 1066519
* SnapdragonCamera: Fix setting video resolution for makeupByunghun Jeon2016-10-131-3/+33
| | | | | | | | | Turning on makeup forces video resolution to be 720x480 which might not be supported by the device. Use one that is equal to or smaller than that. Change-Id: Ife16bf862432e4579d353c0d21179210d9b0957b CRs-Fixed: 1066519
* SnapdragonCamera: Fix setValue in SettingsManagerByunghun Jeon2016-10-131-3/+10
| | | | | | | | When setting value, check if it's a valid one before overriding the current value Change-Id: I1c797ef9e39377b0ade82f2b96a536a12a32b4c5 CRs-Fixed: 1066519
* SnapdragonCamera: frame capture pathJack Yoo2016-10-131-1/+1
| | | | | | | | | | | Frame the path for each capture. 1. ZSL image -> YUV reprocess -> filters -> framework jpeg encoding 2. Non-ZSL -> filters -> framework jpeg encoding 3. Optimizing bestpicture filter image saving 4. Adjusting roi according to the mirror Change-Id: I8989ec57beec3420e6f4311dff951af0a84f5ba9 CRs-Fixed: 1071798
* SnapdragonCamera: SelfieMirror Camera2Jack Yoo2016-10-131-0/+1
| | | | | | | SelfieMirror filter for camera2. Change-Id: Id5fda369a56421199a8c2537491608b8667fb77e CRs-Fixed: 1071798
* SnapdragonCamera: Fix flash toggle buttonByunghun Jeon2016-09-271-0/+1
| | | | | | | | Add flash auto mode to flash toggle button and show flash button while taking video Change-Id: Iffc81ba15b1651c45f826a835274c20f46dbb8cd CRs-Fixed: 1066519
* SnapdragonCamera: Makeup featureJack Yoo2016-09-271-6/+1
| | | | | | | Makeup feature for camera preview and video Change-Id: Ia8cdb629372333c9dceef8aa474402553b7259f0 CRs-Fixed: 1067848
* SnapdragonCamera: Chromaflash FilterJack Yoo2016-09-271-0/+3
| | | | | | | Adding Chromaflash Filter for Camera2 Change-Id: I04b399abe26a3fdcdc91240036a683711b21f8a8 CRs-Fixed: 1067848
* SnapdragonCamera: Panorama ModuleJack Yoo2016-09-271-0/+3
| | | | | | | Introducing Panorama capture module for Camera2 Change-Id: I98306c6c88c34c58b99adf9d472418392015f6c5 CRs-Fixed: 1067848
* SnapdragonCamera: Add exif thumbnail to Camera2 capturesJay Wang2016-09-271-0/+5
| | | | | | | Add embedded thumbnails for Camera2 captures. CRs-Fixed: 1068516 Change-Id: I5c0fdb3ddee3dd676a6b1ab91e5e7c33322e49b1
* SnapdragonCamera: Change video snapshot picture size logicByunghun Jeon2016-09-271-1/+0
| | | | | | | | Remove auto video snapshot size menu and use picture size setting instead. In case of 4k, use one that is smaller than 4k. Change-Id: Ic8ab193055afa0f571c73a074d346c2a9f8dbacd CRs-Fixed: 1066519
* SnapdragonCamera: Fix HFR setting list issueByunghun Jeon2016-09-271-7/+10
| | | | | | | Update HFR setting list when video quality is changed Change-Id: Id90f30e029ae4e6d0a43d432ca7164706ac58d19 CRs-Fixed: 1066519
* SnapdragonCamera: Add developer options for Camera2Byunghun Jeon2016-09-271-0/+1
| | | | | | | | | Add developer options for Camera2. They can be shown by tapping 10 times on Version Info from setting menu in Camera2. Change-Id: Iafb202c8cca5136c8e720135effcc6d0d688702a CRs-Fixed: 1066519
* SnapdragonCamera: Add OneUI to Camera2Byunghun Jeon2016-09-271-31/+81
| | | | | | | | | | Add new UI called OneUI to Camera2. It replaces icons, adds 2 new activities for scene menu and setting menu. There is no module change anymore Change-Id: If712e6af7bbc29726dae387168aefbcd2d7c1ea9 CRs-Fixed: 1066519
* SnapdragonCamera: Use persist to set Camera1/Camera2 modeByunghun Jeon2016-09-271-5/+0
| | | | | | | | | Use persist flag to choose camera1 or camera2. Flag is persist.camera.camera2 Default will be camera1 Change-Id: Ic616b3d4b9f1293e45c7a006587f5c9ba34a0687 CRs-Fixed: 1066444
* SnapdragonCamera: Filter video size based on supported camcorder profileJay Wang2016-09-271-2/+14
| | | | | | | | Supported video size needs to be finalized by checking the supported camcorder profile. CRs-Fixed: 1066540 Change-Id: I131779263cfee229aa82a97453d7ba0402031717
* Merge "SnapdragonCamera:Add intent interface for APT automation" into ↵Linux Build Service Account2016-08-251-2/+4
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Add intent interface for APT automationjunjiez2016-08-161-2/+4
| | | | | | | | | | | | | | | | Add intent interface to allow APT changing the UI settings by adb command. Change-Id: I28276ed398a09dceca6c5e59c755339fb229d1fd CRs-Fixed: 1043197
* | SnapdragonCamera: Add shutter sound to camera2Byunghun Jeon2016-08-161-0/+1
| | | | | | | | | | | | | | | | Add shutter sound menu to settings and allow user to turn on/off shutter sound in camera2 mode CRs-Fixed: 1050117 Change-Id: I624f28428415b8dde7da6e4908c26dd59bb3fbdb
* | SnapdragonCamera: Add selfie flash to camera2Byunghun Jeon2016-08-161-0/+5
| | | | | | | | | | | | | | Add selfie flash to camera2 CRs-Fixed: 1047161 Change-Id: I2ee7033d7854bb15fb9eabe215aaf063b440aee4
* | SnapdragonCamera: Add High Framerate Video captureByunghun Jeon2016-08-161-0/+102
| | | | | | | | | | | | | | | | Add high framerate video capture. Only show supported options for current video size. CRs-Fixed: 1045405 Change-Id: Ib0dd7e63c167ead0fd734382d3ad4fdc7a64f8cc
* | SnapdragonCamera: Bestpicture scene filterJack Yoo2016-08-161-0/+3
| | | | | | | | | | | | | | Adding best picture selection scene filter Change-Id: Ifa0f544e80d161eaef743d611c712d8db48e5631 CRs-Fixed: 1050663
* | SnapdragonCamera: StillMore to camera2Jack Yoo2016-08-161-0/+2
|/ | | | | | | Adding stillmore to camera2 Change-Id: I82bd9931168b831bf1c819935c47113f37d7a188 CRs-Fixed: 1050663
* SnapdragonCamera: Saving MPO and DDM without CSJay Wang2016-07-261-0/+3
| | | | | | | Saving MPO and DDM without CS CRs-Fixed: 993611 Change-Id: Ie04bce460c57454b4cf57c88b47ef2a495b6e078
* SnapdragonCamera: Replacing mono surfaceJack Yoo2016-07-071-1/+1
| | | | | | | Replacing mono surface to allocation dummy surface Change-Id: I8ed7396e6bee7fd34e223f285c0d9693ff04527a CRs-Fixed: 1035245
* SnapdragonCamera: Adding ubifocus post proc filterJack Yoo2016-07-071-1/+18
| | | | | | | Introducing ubifocus to camera2. Change-Id: I611bea207b9cbbde56a23720b22a5a5e3daa215f CRs-Fixed: 1035245
* SnapdragonCamera: FrameListener and Video frame processorJack Yoo2016-07-071-1/+40
| | | | | | | | Adding FrameListener with TrackingFocus Adding VideoFrameProcessor with beautification Change-Id: Id51a0417af43140ed27ea5859ff939adc2e78c43 CRs-Fixed: 1035245
* Merge "SnapdragonCamera: Allow take snapshot while recording video" into ↵Camera Software Integration2016-07-041-0/+7
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Allow take snapshot while recording videoByunghun Jeon2016-06-291-0/+7
| | | | | | | | | | | | | | | | Allow take snapshot while recording video by showing shutter button. Directly call capture when shutter button is pressed. Change-Id: Iae4d42d8878ea82b459ec67709b0ad8e340c8226 CRs-Fixed: 1028463
* | Merge "SnapdragonCamera: Add face detection to camera2" into ↵Camera Software Integration2016-07-041-0/+22
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add face detection to camera2Byunghun Jeon2016-06-291-0/+22
| | | | | | | | | | | | | | | | Add face detection to camera2. Receive face data from camera2 and use faceView UI to draw it Change-Id: Id9c49ab6dd73de316398c57981cc0b9df0400b45 CRs-Fixed: 1025797
* | Merge "SnapdragonCamera: Use json file to read setting dependency" into ↵Camera Software Integration2016-07-041-187/+122
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Use json file to read setting dependencyByunghun Jeon2016-06-291-187/+122
| | | | | | | | | | | | | | Instead of writing the dependency in java, read the dependency from json file Change-Id: I5a46d35b66a289e2a3ee8b72d0059fd9929891f2