summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap: Add back SCENE_MODE_HDR_INT definitionMichael Bestas2020-03-141-0/+1
| | | | | | This partially reverts commit 4fbfaff93c9abd0825453c7b91c1528a38bd4564. Change-Id: Id94048813862ee43941295d64ee7d31fe3bfb6e4
* Merge tag 'LA.UM.8.1.r1-14300-sm8150.0' of ↵Michael Bestas2020-03-1112-41/+188
|\ | | | | | | | | | | | | | | | | | | | | | | https://source.codeaurora.org/quic/la/platform/packages/apps/SnapdragonCamera into lineage-17.1 "LA.UM.8.1.r1-14300-sm8150.0" Conflicts: src/com/android/camera/CameraHolder.java src/com/android/camera/CaptureModule.java Change-Id: Ifc0f89fcc36e8ce225cda91b1e6fe8c44e9bee29
| * Merge 7dafc0bea65f88b9f9ba707a317b371df53d32af on remote branchLinux Build Service Account2020-02-041-1/+3
| |\ | | | | | | | | | Change-Id: I070f3467ad207d76a6a77c1e23d1c66b3b114652
| | * SnapdraongCamera: cct mode wb is errorjiaoyuan2020-01-111-0/+1
| | | | | | | | | | | | | | | | | | | | | when cct mode, should set CONTROL_AWB_MODE_OFF to CONTROL_AWB_MODE, then the wb will show Manual. Change-Id: Idb37e11f140181683ea72b58af50c31edb9abae2
| | * SnapdragonCamera: Enable CAF function when HDR mode is ON.xianming wang2020-01-111-1/+2
| | | | | | | | | | | | | | | | | | Enable CAF function when HDR mode is ON. Change-Id: I8a75c9b6fd5392d2385f40fccc7eae05a23a75d5
| | * SnapdraongCamera:Support GTS intentjunjiez2020-01-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Get extra parameter from GTS intent to check if need to open front camera. Change-Id: Ide3d004ceb3626a246a45f9ec18db454628a6542 CRs-Fixed: 2581193
| | * SnapdraongCamera:Allow voice launchjunjiez2020-01-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add android.intent.category.VOICE in the mainifest Change-Id: Id4201c468a69529a26f9c819de5f27bfacec045e CRs-Fixed: 2581193
| * | Merge "SnapdraongCamera:Allow voice launch" into ↵Linux Build Service Account2020-01-091-0/+4
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0.r2-rel
| | * | SnapdraongCamera:Allow voice launchjunjiez2020-01-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add android.intent.category.VOICE in the mainifest Change-Id: I061e8587b93db579ccde2006664fb274b12742a8 CRs-Fixed: 2581193
| * | | SnapdraongCamera:Support GTS intentjunjiez2020-01-091-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | Get extra parameter from GTS intent to check if need to open front camera. Change-Id: I5803e2460f195524cbf139842f6e433e0a7321b4 CRs-Fixed: 2581193
| * | Merge 554182a31ec4aff133c82119f7bcaccb130b2baf on remote branchLinux Build Service Account2020-01-084-8/+13
| |\| | | | | | | | | | Change-Id: Icda0aacfe952268ac3c3c75fdeee3c441b95dc05
| | * Merge "Update version number to 2.02.037" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2020-01-011-1/+1
| | |\
| | | * Update version number to 2.02.037jinwu2019-12-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: Iffbbb899a4a57433c26f23664042f96c152f7c4e
| | * | Merge "Fix issue of updating Flash in HFR" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2020-01-011-5/+4
| | |\ \
| | | * | Fix issue of updating Flash in HFRjinwu2019-11-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't allow to change requests batch in high speed session, so when update flash mode in HFR, it should still send preview and video requests together. Change-Id: Id4092acca15e2bf465f1ebd632f2fa4799567594
| | * | | Merge "SnapdragonCamera: Fix NP on monkey case" into ↵Camera Software Integration2020-01-011-1/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | | * | | SnapdragonCamera: Fix NP on monkey casexianming wang2019-11-291-1/+4
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Fix NP on monkey case. Change-Id: Ia7e7a5bc5edab31adaf5e35668d12e77a4890257
| | * / | SnapdraongCamera: disable color filter when enable mfnrjiaoyuan2019-12-022-1/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | Color filter menu shoud be disabled when enable MFNR in front camera Change-Id: I41689623f5221a14938deb5e65f55e91ae41bdc2
| * | | Merge ffec76b20605e741a922960b28e772bd3cc8cfa0 on remote branchLinux Build Service Account2019-12-096-29/+100
| |\| | | | | | | | | | | | | | Change-Id: I56d896f82ed3ad2deab62950dbec3fd5673e6ac2
| | * | Merge "SnapdraongCamera: set mLongshoting false" into ↵Camera Software Integration2019-11-281-0/+2
| | |\ \ | | | | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | | * | SnapdraongCamera: set mLongshoting falsejiaoyuan2019-11-071-0/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | set mLongshoting false when long capture finish Change-Id: If64153b17976552917ef82f04ba9baab4aaf61ee
| | * | Merge "SnapdraongCamera:Disable HEIF when SelfieMirror" into ↵Camera Software Integration2019-11-281-0/+30
| | |\ \ | | | | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | | * | SnapdraongCamera:Disable HEIF when SelfieMirrorjunjiez2019-11-111-0/+30
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SelfieMirror need to use app-zsl,but app-zsl is not supported,so disable heif when SelfieMirror is enabled. Change-Id: I31a5e482a73716521dd3bacd637db4df119a508d CRs-Fixed: 2534960
| | * | Merge "SnapdraongCamera: fix exception" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2019-11-281-1/+1
| | |\ \
| | | * | SnapdraongCamera: fix exceptionjiaoyuan2019-11-151-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | when onCaptureSequenceCompleted, surface is not ready, catch exception Change-Id: Ia58afe18210bdbebdaf372b52e6234652cd4db33
| | * | Merge "SnapdragonCamera: Add TextView for fix UI blured" into ↵Camera Software Integration2019-11-281-0/+13
| | |\ \ | | | | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | | * | SnapdragonCamera: Add TextView for fix UI bluredxianming wang2019-11-201-0/+13
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Add TextView for fix UI blured. CRs-Fixed: 2557406 Change-Id: I398d64129038367826569d615dac8df7c3ee6e1c
| | * | Merge "SnapdraongCamera: hide flash icon" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2019-11-281-1/+6
| | |\ \
| | | * | SnapdraongCamera: hide flash iconjiaoyuan2019-11-191-1/+6
| | | |/ | | | | | | | | | | | | | | | | | | | | Flash icon should be hidden when SW MFNR enabled. Change-Id: I6dee92825d1b069f364a325457cf82ed9f649a68
| | * | Merge "Update version number to 2.02.036" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2019-11-281-1/+1
| | |\ \
| | | * | Update version number to 2.02.036jinwu2019-11-221-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: Ic07be9d88284b0c9e6a45c2f49c03eec158190ac
| | * | Merge "SnapdraongCamera:Fix recording pause" into ↵Linux Build Service Account2019-11-281-2/+8
| | |\ \ | | | | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | | * | SnapdraongCamera:Fix recording pausejunjiez2019-11-151-2/+8
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch IllegalStateException when fails to pause video recording. Change-Id: Id1c4978db58bd040dd695313bf246202fd7357c7 CRs-Fixed: 2565211
| | * | Merge "SnapdragonCamera: Filter less 720P videoSize when EIS enable" into ↵Linux Build Service Account2019-11-282-22/+33
| | |\ \ | | | | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | | * | SnapdragonCamera: Filter less 720P videoSize when EIS enablexianming wang2019-11-152-22/+33
| | | |/ | | | | | | | | | | | | | | | | | | | | Filter less than 720P video quality when EIS enable. Change-Id: I9dbcccceb9e17927eb46afb3a6210621aaa8bb60
| | * | Merge "SnapdraongCamera:Add shutter logs" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2019-11-281-0/+2
| | |\ \
| | | * | SnapdraongCamera:Add shutter logsjunjiez2019-11-211-0/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add logs for shutter button when click and release to indicate shot to shot latency Change-Id: Ie16c6341b396243164c03ecdf6f60a25023f5bef CRs-Fixed: 2515200
| | * / SnapdraongCamera: hide AEB after restorejiaoyuan2019-11-222-2/+4
| | |/ | | | | | | | | | | | | | | | hide AEB after restore Change-Id: I5f9b6222e2f14eab7a41da04f90bb1f5b87faabe
| * | Merge f3b7cacf2b53b3239fc29ffddc2028be6dba89a2 on remote branchLinux Build Service Account2019-11-169-27/+91
| |\| | | | | | | | | | Change-Id: I082200d89429742edeb5ad05a0603c4a09c6db7c
| | * Update version number to 2.02.035jinwu2019-11-061-1/+1
| | | | | | | | | | | | Change-Id: I78b8bef52fff617a9f0d701cf3d9edb7dd172622
| | * Merge "SnapdragonCamera: Correct the mBackCameraId and mFrontCameraId" into ↵Camera Software Integration2019-11-061-2/+3
| | |\ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | | * SnapdragonCamera: Correct the mBackCameraId and mFrontCameraIdxianming wang2019-10-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Correct the mBackCameraId and mFrontCameraId. Change-Id: I10904c601801c89b89f1fb21468d5c7a420bfb4a
| | * | Merge "SnapdraongCamera:APP-ZSL size" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2019-11-061-1/+6
| | |\ \
| | | * | SnapdraongCamera:APP-ZSL sizejunjiez2019-10-291-1/+6
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to get max supported size as APP-ZSL size, then crop into picture size to avoid FOV issue Change-Id: I298544d849af6ba4944826f8960e47331b4abe34 CRs-Fixed: 2545491
| | * | Merge "SnapdragonCamera: Flash icon appears after countdown" into ↵Camera Software Integration2019-11-061-1/+9
| | |\ \ | | | | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | | * | SnapdragonCamera: Flash icon appears after countdownjiaoyuan2019-10-181-1/+9
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Flash icon appears after snapshot with countdown timer in ProMode Change-Id: I21101397b617e8afc433118400bb4b07ae061801
| | * | Removes all usages of ScriptC_* variables.Divya Sharma2019-11-041-15/+0
| | | | | | | | | | | | | | | | Change-Id: I42386aac4e9f534637fe1a81f29c596341dc8077
| | * | Merge "Update version number to 2.02.034" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2019-11-011-1/+1
| | |\ \
| | | * | Update version number to 2.02.034jinwu2019-10-171-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: If8b54dd0aee479d5cbd8184835393a22cfe969d2
| | * | Merge "SnapdragonCamera: Disable MPEG4 when enable EIS and less 720P" into ↵Camera Software Integration2019-11-012-0/+26
| | |\ \ | | | | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 19:08:30 +0000