summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
* Snap: api2: add QR scanner modeTimi2021-05-101-4/+18
| | | | Change-Id: I99a11907ab5bdd04e6c3f9780f8df18265e7d4bf
* Snap: notify user if HFR will not workTimi2021-04-051-0/+4
| | | | | | * Nice to know Change-Id: I649b3b3930ba7fe15be2b130b8bff708921789cd
* Snap: reorganize api2 layoutTimi2021-04-041-0/+20
| | | | | | | * added icons from https://material.io/resources/icons/ except ic_switch_{hfr,sat} are self made Change-Id: I9ffc276915297f0cbb31258d325b2459bf20dc1e
* Revert "Snap: Remove saving to sdcard"Arne Coucheron2021-03-261-2/+28
| | | | | | This reverts commit ae0a8f6a11d4be8234dbe6708676405f98882c95. Change-Id: I47335bd39d4b8a96658a14fd51af6c3d581327af
* CaptureModule: Only look for ssm capture results if ssm is enabledPaul Keith2020-12-241-15/+21
| | | | | | | * Otherwise, this will crash with an IllegalArgumentException * While we're at it, catch the exception anyways Change-Id: I41ff60006e94428236293391ce20173c4cd775d4
* CaptureModule: Fix init sequencePaul Keith2020-12-241-10/+13
| | | | | | | | | | | * Now that we derive camera IDs from scene mode, we must set the current scene mode during the init process * Also, set the next mode index so that the mode default is correct when switching cameras * Additionally, correctly set the current mode index for posterity * This is done before mSettingsManager.init() to match restartAll() Change-Id: I9286d8e50ff956bf3e6903b8db4320fff24c04f4
* Snap: Remove saving to sdcardMichael W2020-11-301-28/+2
| | | | | | | | | * Doesn't work anymore since the introduction of scoped storage * Giving the users this option doesn't make sense anymore -> Not available >> Doesn't work Change-Id: I763ff23b04cd093f15f439a91160c2b086b18f72
* Snap: Don't remove scene modes!dianlujitao2020-11-261-2/+1
| | | | | | This partially reverts commit 8acb462b46c930bf6f6c6192012a11f2e127ecc4. Change-Id: I5864924938189b17efa9a496912a51b9c2b233c1
* Snap: Perform null check on AF state in updateCaptureStateMachinedianlujitao2020-11-261-0/+5
| | | | | | | | | * Some camera HAL implementations don't push AF state to urgent metadata. E.g. for QCOM camera HAL this happens only after https://source.codeaurora.org/quic/la/platform/hardware/qcom/camera/commit/?h=LA.UM.7.2.r1-07700-sdm660.0&id=d276a953295364b967c36038362c1e7ea268bdad * Fix crash on capture after c724bc35a9c5f3b36ce36a2081559e2644993da4 Change-Id: I8980fd3fb7d7db4f61189281580ecb17778602df
* Snap: Check various feature support before applyingWang Han2020-11-261-2/+14
| | | | | | * Fixes crash on devices which does not support it Change-Id: I39b9424ad200db6819a11aac6c319a22542d4131
* Drop new focus indicator into Camera2.Paul Rohde2020-11-261-10/+10
| | | | | | | * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
* Snap: don't try to set up cameras with ids greater than MAX_NUM_CAMcodeworkx2020-11-261-1/+11
| | | | | | * fixes ArrayIndexOutOfBoundsException on setUpCameraOutputs Change-Id: I1565576b604bdcebea85d65f3c7a2b332292ed2d
* Snap: check tags before using themcodeworkx2020-11-261-0/+6
| | | | | | | MessageQueue-JNI: java.lang.IllegalArgumentException: Could not find tag for key 'org.codeaurora.qcamera3.saturation.use_saturation') Change-Id: Ia42c67552f9d4574e5f86af2ac5aea853198d0ed
* Snap: CaptureModule: check if ZSL is supported before using itcodeworkx2020-11-261-12/+29
| | | | Change-Id: Ifde34ce367ceeb19ad71bcff0c4518d578bb52a5
* Snap: Materializejrizzoli2020-11-261-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Thu Jan 7 21:07:51 2016 +0100 Snap: initial materialization Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it> Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Mon Jan 11 21:02:08 2016 +0100 Snap: remove captureUI pngdrawables CM now supports 90/270 degrees rotated vectordrawables Change-Id: I13b36463c60430564c00bd1e36393fff7ddbfdae Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it> Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Wed Jan 20 20:54:10 2016 +0100 Snap: update shutter button style Change-Id: Ide5fc0ff1c54e216ac7cd9bea202002d1d4dfa12 Author: Joey Rizzoli <joey@cyanogenmoditalia.it> Date: Sun Dec 11 21:30:18 2016 +0100 Snap: update caf icons Change-Id: I1adaf709253637bde037b5aea1f856fc5b9029c7 Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it> Author: Arne Coucheron <arco68@gmail.com> Date: Thu Aug 17 01:19:05 2017 +0200 Snap: Update HDR icons Current ones are so small, I can hardly see them. These new ones are bigger and looks more in line with the rest of the icons. Change-Id: Idaeec67a78d66105a375f09b6701a49dce43fd22 Author: codeworkx <daniel.hillenbrand@codeworkx.de> Date: Sat Jan 20 12:46:31 2018 +0100 Snap: update shutter buttons on CaptureUI Change-Id: I674de05dfb46fb714979ac66c16a85825af13c95 Author: Paul Keith <javelinanddart@gmail.com> Date: Tue Jan 23 23:36:19 2018 +0100 Snap: Update pano and video icons to be more like photo icons * Put the colored ring on the _outside_ of the shutter * While we're at it, cleanup naming and usage of color resources Change-Id: I4f344fa272374d043f2b83dba7248e263fab8bf0 Author: Andreas Blaesius <andi@unlegacy-android.org> Date: Fri Jun 1 17:47:00 2018 +0200 Snap: remove unused shutter buttons Change-Id: Id913626bbccc6fd245ed9f46374389ca7eca3c30 Change-Id: I7596f3c887874b4913d87ecbfa5438191fc86249 Signed-off-by: Chippa-a <vusal1372@gmail.com>
* Camera2: Remove CAF video duration codeMichael Bestas2020-11-261-0/+4
| | | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2 Signed-off-by: Chippa-a <vusal1372@gmail.com>
* Revert "SnapdragonCamera: Forbid volume key can take picture"Michael Bestas2020-11-151-5/+1
| | | | | | This reverts commit e73e717b8be1ba834161914af4debc61c1feb8be. Change-Id: Iee719f34f6016f89ec0bb1c078bfa25c2f718436
* Snapcam: Limit preview fps to 30 in 60fps recordingjinwu2020-09-131-5/+13
| | | | | | | | Issue: Snapcam can't call hidden API to limit preview fps. Fix: Create requests list(PV + V) and call sendRepeatingBurst to limit preview fps to 30. Change-Id: Ia461ed1385540a06ccffa68407e824f0bcaeffe8
* Snapcam: monkey test for null object referenceAoao Yang2020-09-041-0/+2
| | | | Change-Id: I0a16d0546a5dcd108cac7273039b8c41b61e850d
* Merge changes Ie6ffef2a,I283e698e,Iebf8dafe into camera-SnapdragonCamera.lnx.4.1Linux Build Service Account2020-08-241-3/+9
|\ | | | | | | | | | | | | * changes: snapcam: disable camera switch button Snapcam: Enable videoButton when HFR onConfigured success snapcam: add reinit settingmanager
| * snapcam: disable camera switch buttonjiaoyuan2020-08-211-2/+6
| | | | | | | | | | | | | | only after session configed, then set camera switch button enable Change-Id: Ie6ffef2a74c3a69f60292f0fb92e91ef158da7b7
| * Snapcam: Enable videoButton when HFR onConfigured successjiaoyuan2020-08-211-1/+2
| | | | | | | | | | | | Enable videoButton when HFR onConfigured success. Change-Id: I283e698e0876203347913c023c0bc2646753f060
| * snapcam: add reinit settingmanagerjiaoyuan2020-08-211-0/+1
| | | | | | | | | | | | | | | | reinit settingmanager after change camera id after change cameraid, if donot reinit, will use previous settings, it is wrong, so change it Change-Id: Iebf8dafe7feef5303c62496def1788bea38156db
* | Merge "SnapCam: App use captureBurst when HFR mode" into ↵Linux Build Service Account2020-08-241-2/+11
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.4.1
| * | SnapCam: App use captureBurst when HFR modexianming wang2020-08-211-2/+11
| |/ | | | | | | | | | | | | Caused: App didn`t use the capture request in HFR mode. Solution: App will use captureBurst request in HFR mode. Change-Id: I1e8339c4872359bb3f9d7c800618b1e69376f48e
* / Snapcam: Enable TAF during recordingjiaoyuan2020-08-211-2/+1
|/ | | | | | Enable TAF during recording Change-Id: I93637aeb9f5e40d6cb2c158c6692e4ac91c8b8db
* Snapcam: Correct right camera id in init methodxianming wang2020-08-191-1/+13
| | | | | | Correct right camera id in init method. Change-Id: I9b1b98eb0f4e365495e4b8bd63ebf34fe1e58094
* Merge "Snapcam: fix memory leak issue" into camera-SnapdragonCamera.lnx.4.1Linux Build Service Account2020-08-131-0/+2
|\
| * Snapcam: fix memory leak issuejiaoyuan2020-08-131-0/+2
| | | | | | | | | | | | WatchdogThread is not stoped, kill it Change-Id: I112529be982fc9ae4513b90eb3611808819645e6
* | Merge "Snapcam: Fix resume camera" into camera-SnapdragonCamera.lnx.4.1Linux Build Service Account2020-08-131-1/+3
|\ \
| * | Snapcam: Fix resume camerajunjiez2020-08-131-1/+3
| |/ | | | | | | | | | | | | | | | | When relaunch camera app, if camera is closed, need to open camera again to avoid black preview. Change-Id: I800f0d2f246c1e4367671946b164b307e8f9eabd CRs-Fixed: 2685731
* | Merge "Snapcam: after long press, flash is not off" into ↵Linux Build Service Account2020-08-131-5/+14
|\ \ | |/ |/| | | camera-SnapdragonCamera.lnx.4.1
| * Snapcam: after long press, flash is not offjiaoyuan2020-08-111-5/+14
| | | | | | | | | | | | fix flash is not off after long press Change-Id: If3d99995415e07b42fc29d9f423d2d63b1d3d79c
* | Merge "Snapcam: catch IllegalArgumentException" into ↵Linux Build Service Account2020-08-131-1/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.4.1
| * | Snapcam: catch IllegalArgumentExceptionjiaoyuan2020-08-091-1/+1
| |/ | | | | | | | | | | catch IllegalArgumentException Change-Id: Id9d44f18f247ce3f0ab8d6b49ab130f002370692
* / Snapcam: unlock expouse when change modejiaoyuan2020-08-101-2/+5
|/ | | | | | unlock expouse when change mode Change-Id: I318b8891f512d21188502e22efcec29c5fce531a
* Merge "Snapcam: do not take picture when shutter button disable" into ↵Linux Build Service Account2020-08-061-0/+7
|\ | | | | | | camera-SnapdragonCamera.lnx.4.1
| * Snapcam: do not take picture when shutter button disablejiaoyuan2020-07-211-0/+7
| | | | | | | | | | | | do not take picture when shutter button disable Change-Id: I9d90c339e0ad95138b0da567fa249a8f6752ae0f
* | Merge "Snapcam: Fix GtsAssistantHostTestCases case" into ↵Linux Build Service Account2020-08-061-2/+45
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.4.1
| * | Snapcam: Fix GtsAssistantHostTestCases casexianming wang2020-07-311-2/+45
| |/ | | | | | | | | | | | | | | Fix GtsAssistantHostTestCases 1.Fix testAssistantTakePhotoWithVoiceInteraction case. 2.Fix testAssistantTakeSelfieWithVoiceInteraction case. Change-Id: I497a1f1f4a388774a8c6d4615f54ec9f32ea34c4
* | Merge "Snapcam: Remove repeated call the settingmanager.init method" into ↵Linux Build Service Account2020-08-061-1/+0
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.4.1
| * | Snapcam: Remove repeated call the settingmanager.init methodxianming wang2020-07-201-1/+0
| |/ | | | | | | | | | | | | Remove the repeated call the SettingsManager.init method. CRs-Fixed: 2727768 Change-Id: I9ebdbe6e8cc1457fe3d42e643a803964674e2485
* / Snapcam: Video start button is grey in message appjiaoyuan2020-07-211-0/+1
|/ | | | | | | 1.mms do not support high speed record 2.show recording ui from mms Change-Id: I425a8fe9f20d816d70357499e967576e4a643959
* Snapcam: change MaxBurstShotFPS from int to floatjiaoyuan2020-07-131-5/+5
| | | | | | change MaxBurstShotFPS from int to float Change-Id: I7047638f4c74cf7316cab528adb81e4cffef9429
* Snapcam: add mctf tagjiaoyuan2020-07-061-0/+17
| | | | | | add mctf tag, use prop control Change-Id: Ic320083897d8d30a247de301a26e362e783101a7
* Merge "Snapcam: Fix NullPointerException for Monkey test" into ↵Linux Build Service Account2020-07-051-1/+3
|\ | | | | | | camera-SnapdragonCamera.lnx.4.1
| * Snapcam: Fix NullPointerException for Monkey testxianming wang2020-07-011-1/+3
| | | | | | | | | | | | Fix NullPointerException for Monkey test. Change-Id: Ibb79d038d52f296c0b5f919e776609288dc7b0eb
* | Snapcam: send double num capture requestsjiaoyuan2020-07-011-1/+3
|/ | | | | | | | 1.send double num capture requests 2.burst shot fps number default vaule is 1, so if the prop value >1, use the prop value Change-Id: Ic61323e30b1b076f439717abe5a815ea706f8a8b
* Snapcam:Remove landmarksjinwu2020-06-021-1/+1
| | | | | | STATISTICS_FACE_LANDMARKS is hidden, remove it first. Change-Id: I9c999717c02c57b81efa4258d9ba535698cb6559
* Snapcam: Fix Hide APIs comiletaion issuesjinwu2020-05-281-159/+60
| | | | | | | 1.Remove non-used Hide APIs 2.Replace used Hide APIs Change-Id: I5a16b7f96d103022953845febf12fbb4eb596a5d