summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Revert "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"Weijie Wang2017-09-026-250/+97
| | | | | | This reverts commit b5533d51a7c97138235d29b35cec876d107aeadd. Change-Id: I8063422680802e25d03a374be91e884a86ad55e9
* SnapdragonCamera: Disable zsl by defaultWeijie Wang2017-08-311-1/+1
| | | | | | Disable zsl by default Change-Id: Ife3950693baa0b390d75d81e317190565da74ec0
* Merge "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"Linux Build Service Account2017-08-306-98/+251
|\
| * SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3Weijie Wang2017-08-306-98/+251
| | | | | | | | | | | | Sync LA.UM.6.4 to LA.UM.6.3 Change-Id: Ide9a53b3b5ea6d17154003e4059ae3125f9f3346
* | SnapdragonCamera: Fix UI Display confusion in ProModemingwax2017-08-295-77/+169
|/ | | | | | | | Refactoring the layout of pro_mode_layout.xml, optimizing layout files, and reducing performace overhead. CRs-Fixed: 2027214 Change-Id: I7005b5a38498b6867c0d6b971aef13fcd1359433
* Hack: disable ZSL for CamXJay Wang2017-07-281-1/+1
| | | | Change-Id: Iffc10ad19b16d132a9d2728b0428a67dacde4a2d
* SnapdragonCamera: Add ZSL in HAL modeWeijie Wang2017-07-262-8/+15
| | | | | | Add ZSL in HAL mode Change-Id: Ifa803c970cfc559723e3599821b74cc8584782a2
* Change the default picture to 8M and video to 1080PJay Wang2017-07-072-0/+7
| | | | Change-Id: I411789b39804f0df6f7898ae25b3e4948a18491d
* Minimum change to enable non-ZSL preview for CamxJay Wang2017-07-071-1/+1
| | | | Change-Id: I191c16070c96a8ec5a06dd6496313911dd146e5c
* Revert "SnapdragonCamera: Changes for SDM bringup"Jay Wang2017-07-071-1/+0
| | | | | | This reverts commit f245124ed851a0888dbced9b887d0db2f0135177. Change-Id: I4c9d787c5486c822a764f7b2551a87c2f924fbcd
* SnapdragonCamera: Changes for SDM bringupJack Yoo2017-06-131-0/+1
| | | | | | | | | | | | | | | | Changes to accomodate the SDM bringup 0. Image flow change to be compatible to early version of CAMX 1. Pseudo ZSL mode to capture as configuring requires to be done all at the same time. 2. Video recording starts from the beginning as well for same reason. 3. Adding Cameracharacteristc availability check as meta is not all available yet. 4. Adding persist to selectively enable 4K Video recording in which case snapshot is disabled. The default is 1080P. Change-Id: Ib808dd2fe25398c444b220d40693a0436e4f6db5
* Merge "SnapdragonCamera: Fix no flash settings menu" into camera.lnx.1.0-dev.1.0Linux Build Service Account2017-04-251-4/+4
|\
| * SnapdragonCamera: Fix no flash settings menumingwax2017-04-211-4/+4
| | | | | | | | | | | | | | | | | | (1) When user switch from photo mode to video mode, the object of mParameters should be updated. (2) Set the videoFlash mode values. CRs-Fixed: 2021123 Change-Id: Ie1e3ceba4c2304a57ae2758ab33de08825e72247
* | Merge "SnapdragonCamera: FR40621 ClearSight/DDM integrate ClearSight/DDM, ↵Linux Build Service Account2017-04-241-0/+0
|\ \ | |/ |/| | | integrate Clear Sight in Camera Framework" into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: FR40621 ClearSight/DDM integrateweijiew2017-03-081-0/+0
| | | | | | | | | | | | | | ClearSight/DDM, integrate Clear Sight in Camera Framework CRs-Fixed: 1108837 Change-Id: Ibde73b15c9361294eb2e0e05967763005a4546e0
* | Merge "SnapdragonCamera: Fix wrong size in review" into camera.lnx.1.0-dev.1.0Linux Build Service Account2017-03-291-3/+3
|\ \
| * | SnapdragonCamera: Fix wrong size in reviewjunjiez2017-03-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | When 3rd-party app calls camera to capture in landscape, the image of preview needs to be rotated to fit the preview. Change-Id: I597160229fa41a977e872cb65264f8c7ea4f7a00 CRs-Fixed: 2016449
* | | Snapdragon: Add ZSL to Dev optionjunjiez2017-03-244-0/+31
|/ / | | | | | | | | | | | | Add ZSL option to develop options, when it's disabled , restart sessions and turn on ZSL Change-Id: I7a3bc2236d0bedb37cf1923763407fd4ab8ec8bd
* | SnapdragonCamera: Smile/blink/gaze detectionjunjiez2017-03-144-3/+33
| | | | | | | | | | | | | | | | Implement Smile/blink/gaze detection feature and add option to enable it in develop options. CRs-Fixed: 1087487 Change-Id: I3005ca9767fbe38323e86255238cd4f96f34fbe5
* | Merge "SnapdragonCamera: fix W+T UI issues" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-092-5/+4
|\ \
| * | SnapdragonCamera: fix W+T UI issuesjunjiez2017-03-022-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix sometimes parameters is not set, slider bar is showed when bokeh is not enabled and slider bar is at the bottom. Change-Id: Ief346442c94d2cbbcdf7a14e11ebd43316b15b05
* | | Merge "Snapdragon: Add auto HDR to Dev option" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-091-0/+7
|\ \ \ | |_|/ |/| |
| * | Snapdragon: Add auto HDR to Dev optionjunjiez2017-03-021-0/+7
| |/ | | | | | | | | | | | | | | When auto HDR is enabled, disable ZSL, and if scene is auto, get isHdrScene from HAL and if HAL return true, apply HDS scene mode. Change-Id: Iac4eef5bf9266ba9ed4779a3b59a93a6ae3eac72
* | Merge "SnapdragonCamera: Add zoom option to developer option for camera2" ↵Linux Build Service Account2017-03-062-0/+16
|\ \ | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Add zoom option to developer option for camera2weijiew2017-03-012-0/+16
| |/ | | | | | | | | | | | | | | | | For automation testing, we need a way to adjust the zoom without using the pinch gesture. Therefore, adding zoom option preference to the developer option. CRs-Fixed: 2008116 Change-Id: Ie459dbbb28051d49f8e4951d6adb112d03cf22f6
* / SnapdragonCamera:Fix The setting list and picture size aren't same as specpezhan2017-03-033-1/+6
|/ | | | | | | | | | | SettingActivity is short of action bar and prefenence title's size not the same as UI spec. Adjust prefenence title's size and style, add actionbar for SettingActivity. Change-Id: I17977f655a99ba087acaaa12232f05341c93471e CRs-Fixed: 1105206
* SnapdragonCamera: Add zoom option to developer optionJay Wang2017-02-194-0/+58
| | | | | | | | For automation testing, we need a way to adjust the zoom without using the pinch gesture. Therefore, adding zoom option preference to the developer option. Change-Id: I37f8c1b4f51682cb398d0a5f779f45128bdc19ec
* SnapdragpmCamera:Support W+T bokeh featurejunjiez2017-01-194-0/+103
| | | | Change-Id: Ic681e0bcfabddcb313943d64e4487f15b934bd50
* Merge "SnapdragonCamera:Fix [FR35432] BestPicture function lost." into ↵Camera Software Integration2017-01-179-6/+308
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix [FR35432] BestPicture function lost.pezhan2017-01-119-6/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dialog when saving selected BestPicture. Add "X" icon display beside camcorder icon to exit BestPicture mode. Add multiple selections(Three dots beside SAVE)and "X" icon. Add dialog when select "X" icon. Add overflow menu with multiple selections to chose "Save All" or "Delete All" when click overflow menu. Add click for "Save All" to save all 1o pictures. Add click for "Delete All" to pop delete all dialog. Change-Id: I59cdad0f77fde616ea34db4d9d186d322285e394 CRs-Fixed: 1102814, 1102807, 1099428
* | SnapdragonCamera:Add Raw capture to developer optionjunjiez2017-01-064-1/+36
|/ | | | | | | | Add raving as Raw option to the developer options, and save both JPEG and RAW data when it't turned on Change-Id: Id2462d0bacc3f2acdf3610b2ca8054079dc40b85 CRs-Fixed: 1087490
* Merge "SnapdragonCamera: Add features to developer option" into ↵Linux Build Service Account2017-01-055-0/+204
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add features to developer optionweijiew2016-12-235-0/+204
| | | | | | | | | | | | | | | | | | | | | | Description: 1、Add Histogram support to developer option 2、Add HDR & Non-HDR support to developer option 3、Add Saturation Level support to developer option 4、Add Anti Banding support to developer option Change-Id: I2db7e1be65a6b3ee04ebc46cb214dc1cc9667fc6 CRs-Fixed: 1103649
* | Merge "SnapdragonCamera: add features for 3rd-party apps" into ↵Linux Build Service Account2017-01-052-0/+73
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: add features for 3rd-party appsjunjiez2016-12-272-0/+73
| | | | | | | | | | | | | | | | | | | | | Add capture and recording features for 3rd-party app. Change-Id: Iefedbed2cb17cca17941e70f861448a2b8f97da2 CRs-Fixed: 1095457
* | | Merge "SnapdragonCamera:Add instant AEC to developer option" into ↵Linux Build Service Account2017-01-054-0/+40
|\ \ \ | |/ / |/| / | |/ camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Add instant AEC to developer optionjunjiez2016-12-234-0/+40
| | | | | | | | | | | | | | Add instant AEC support to developer option Change-Id: Ia83a724966c453cfeb84e12c1728eab264bed6f8 CRs-Fixed: 1087493
* | Merge "SnapdragonCamera: Modify video preview UI" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-221-12/+19
|\ \
| * | SnapdragonCamera: Modify video preview UIjunjiez2016-12-121-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | Ensure all the unuseful icons are hide when Show the video preivew UI. Change-Id: Ia59bb9d50a0d4e2cd8892faa74e6074725c4776e CRs-Fixed: 1099277
* | | Merge "SnapdragonCamera: Dialog display incompletely in landscape mode" into ↵Camera Software Integration2016-12-223-6/+99
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Dialog display incompletely in landscape modeweijiew2016-12-153-5/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new layout for landscape mode CRs-Fixed: 1099373 Change-Id: Ie505c6ef8795e0b8a8b3424afde7cb46fc368136
* | | | Merge "SnapdragonCamera: fix setting menu bug" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-221-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | SnapdragonCamera: fix setting menu bugCullum Baldwin2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where openning the Camera2 settings menu causes a crash. Change-Id: I838eeef9f79b04281d00eaba5e816c542a4d3ea2
* | | | Merge "SnapdragonCamera: The "x" of the scene mark is too large" into ↵Camera Software Integration2016-12-201-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: The "x" of the scene mark is too largeweijiew2016-12-141-3/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Change the "x" of the scene mark to a small size. CRs-Fixed: 1101206 Change-Id: I7f64cd2b68ba30881309e7e5cb3a013e9168661a
* | | | Merge "SnapdragonCamera:Fix bestPicture display in wrong size" into ↵Camera Software Integration2016-12-201-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera:Fix bestPicture display in wrong sizejunjiez2016-12-131-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the size of the imageview to match parent and show the image with its original ratio of width and height to avoid showing in wrong size when rotate the screen. Change-Id: I2b2e68f36248700e9dc21082086854516eb4cac0 CRs-Fixed: 1096576
* | | | Merge "SnapdragonCamera: Noise reduction cann't be turn on" into ↵Camera Software Integration2016-12-201-2/+5
|\ \ \ \ | |/ / / |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Noise reduction cann't be turn onweijiew2016-12-121-2/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Noise reduction has three value(off,fast, high quality), but it was implemented as a SwitchPreference, value of noise reduction can't be persisted. so changing SwitchPreference to ListPreference CRs-Fixed: 1088262 Change-Id: I3faaa433b595b1b8e8c2afbb71f4d42aca5d5ba2
* | | Merge "SnapdragonCamera: Show label and dialog when switch to new scene ↵Camera Software Integration2016-12-1331-0/+251
|\ \ \ | |/ / |/| | | | | mode" into camera.lnx.1.0-dev.1.0