summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Rename property name"Linux Build Service Account2017-04-226-22/+22
|\
| * SnapdragonCamera: Rename property nameweijiew2017-04-206-22/+22
* | Merge "SnapdragonCamera: Hide Chromaflash on Android O"Linux Build Service Account2017-04-221-0/+2
|\ \
| * | SnapdragonCamera: Hide Chromaflash on Android Oweijiew2017-04-201-0/+2
| |/
* | Merge "SnapdragonCamera: Fix "Touch AF not work""Linux Build Service Account2017-04-211-0/+1
|\ \
| * | SnapdragonCamera: Fix "Touch AF not work"weijiew2017-04-181-0/+1
| |/
* | Merge "SnapdragonCamera: Add 8M pixels (16:9) for picture size"Linux Build Service Account2017-04-212-1/+2
|\ \
| * | SnapdragonCamera: Add 8M pixels (16:9) for picture sizeweijiew2017-04-192-1/+2
* | | Merge "SnapdragonCamera: Fix black screen on preview when switch camera"Linux Build Service Account2017-04-212-0/+26
|\ \ \ | |_|/ |/| |
| * | SnapdragonCamera: Fix black screen on preview when switch cameraweijiew2017-04-182-0/+26
| |/
* / SnapdragonCamera: Fix image quality of ChromaFlashjunjiez2017-04-112-6/+56
|/
* SnapdragonCamera: Enable snapcam for Android Oweijiew2017-04-101-2/+0
* SnapdragonCamera: Wrapper for QC APIweijiew2017-03-2918-349/+1706
* Merge branch 'camera.lnx.1.0-dev.1.0' into camera-framework.lnx.2.0-relweijiew2017-03-2914-65/+472
|\
| * Merge "SnapdragonCamera: Add playsound when select UbiFocus filter" into came...Linux Build Service Account2017-03-241-0/+3
| |\
| | * SnapdragonCamera: Add playsound when select UbiFocus filtermingwax2017-03-141-0/+3
| * | Merge "SnapdragonCamera: Fix ghosting when non-zsl in VGA/QVGA size" into cam...Linux Build Service Account2017-03-242-44/+42
| |\ \
| | * | SnapdragonCamera: Fix ghosting when non-zsl in VGA/QVGA sizemingwax2017-03-122-44/+42
| | |/
| * | Revert "SnapdragonCamera:Fix no recording thumbnail when capture during recor...junjiez2017-03-212-7/+3
| * | Merge "SnapdragonCamera: Smile/blink/gaze detection" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-1710-14/+424
| |\ \ | | |/ | |/|
| | * SnapdragonCamera: Smile/blink/gaze detectionjunjiez2017-03-1410-14/+424
* | | Merge branch '20170317' into camera-framework.lnx.2.0-relmingwax2017-03-1743-271/+911
|\| |
| * | Merge "SnapdragonCamera:Fix Camera1 force close when refocusing the picture."...Camera Software Integration2017-03-111-3/+17
| |\ \
| | * | SnapdragonCamera:Fix Camera1 force close when refocusing the picture.pezhan2017-03-071-3/+17
| * | | Merge "SnapdragonCamera: Fixed FC No pre-defined bitrate for video/picture s...Camera Software Integration2017-03-111-1/+1
| |\ \ \
| | * | | SnapdragonCamera: Fixed FCweijiew2017-03-071-1/+1
| | |/ /
| * | | Merge "SnapdragonCamera: Disable Beauty function" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-111-1/+1
| |\ \ \
| | * | | SnapdragonCamera: Disable Beauty functionjunjiez2017-03-071-1/+1
| | |/ /
| * | | Merge "SnapdragonCamera: Fix cancelTouchFocus only once" into camera.lnx.1.0-...Camera Software Integration2017-03-111-9/+27
| |\ \ \ | | |_|/ | |/| |
| | * | SnapdragonCamera: Fix cancelTouchFocus only oncemingwax2017-03-071-9/+27
| | |/
| * | Merge "SnapdragonCamera: ZSL and manual 3A can be on at same time" into camer...Camera Software Integration2017-03-091-6/+1
| |\ \
| | * | SnapdragonCamera: ZSL and manual 3A can be on at same timeqimengp2017-02-281-6/+1
| * | | Merge "SnapdragonCamera: Fix FC when taking QVGA/CIF in chroma Flash mode" in...Camera Software Integration2017-03-091-0/+53
| |\ \ \
| | * | | SnapdragonCamera: Fix FC when taking QVGA/CIF in chroma Flash modemingwax2017-03-031-0/+53
| * | | | Merge "SnapdragonCamera: Shutter button is overlap with Beauty menu" into ca...Camera Software Integration2017-03-091-0/+1
| |\ \ \ \
| | * | | | SnapdragonCamera: Shutter button is overlap with Beauty menuweijiew2017-03-021-0/+1
| | |/ / /
| * | | | Merge "SnapdragonCamera: enable Continous shot option for zzHDR" into camera....Camera Software Integration2017-03-091-1/+4
| |\ \ \ \
| | * | | | SnapdragonCamera: enable Continous shot option for zzHDRjunjiez2017-03-021-1/+4
| * | | | | Merge "SnapdragonCamera: Print the picture name when capture success" into ca...Camera Software Integration2017-03-091-0/+2
| |\ \ \ \ \
| | * | | | | SnapdragonCamera: Print the picture name when capture successweijiew2017-03-021-0/+2
| | | |/ / / | | |/| | |
| * | | | | Merge "SnapdragonCamera: Modify ISO vender tag" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-091-0/+16
| |\ \ \ \ \
| | * | | | | SnapdragonCamera: Modify ISO vender tagqimengp2017-03-011-0/+16
| | | |/ / / | | |/| | |
| * | | | | Merge "SnapdragonCamera: fix W+T UI issues" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-093-17/+20
| |\ \ \ \ \
| | * | | | | SnapdragonCamera: fix W+T UI issuesjunjiez2017-03-023-17/+20
| | | |/ / / | | |/| | |
| * | | | | Merge "Snapdragon: Add auto HDR to Dev option" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-094-0/+27
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Snapdragon: Add auto HDR to Dev optionjunjiez2017-03-024-0/+27
| | |/ / /
| * | | | Merge "SnapdragonCamera: Add zoom option to developer option for camera2" int...Linux Build Service Account2017-03-065-1/+48
| |\ \ \ \
| | * | | | SnapdragonCamera: Add zoom option to developer option for camera2weijiew2017-03-015-1/+48
| | | |/ / | | |/| |
| * | | | Merge "SnapdragonCamera: fix thumbnail displayed in capture mode" into camera...Linux Build Service Account2017-03-062-3/+3
| |\ \ \ \
| | * | | | SnapdragonCamera: fix thumbnail displayed in capture modejunjiez2017-02-282-3/+3
| | |/ / /