summaryrefslogtreecommitdiff
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Camera: Dont reset camera state while capture is in progress.Santhosh Kumar Thimmanna Bhattar2014-01-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While capture is in progress and if we get autofocus event, currently we reset the camera state to IDLE blindly. This is resulting in app exception because it will trigger another takepicture and lower layers will return error. ( cherrypicked from commit 1bed537bb0848b6a1f64f9eb245b1c256999ebad ) Change-Id: Ia595dbad246759870371b749c0aa2def221560c5 CRs-Fixed: 550417
* | | | Merge "Camera2: Enable HDR for zsl mode"Linux Build Service Account2014-01-251-28/+1
|\ \ \ \
| * | | | Camera2: Enable HDR for zsl modeEvgeniy Borisov2014-01-081-28/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | HDR is now supported for zsl mode Change-Id: Ic9985e9f2ca6ffea3f33aef1f6f2949d4876c8d9
* | | | Merge "Camera: Change copy right year back to 2012"Linux Build Service Account2014-01-161-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera: Change copy right year back to 2012Vijay kumar Tumati2014-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this is 3rd party file, we shouldn't change copy right year. Reverting it back to 2012. Change-Id: If617e7607cd89b0270aabbe1186190dfe06fe40c
* | | | Merge "Camera: Avoid preview restart after capture if possible"Linux Build Service Account2014-01-111-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Camera: Avoid preview restart after capture if possibleEmilian Peev2013-12-181-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If the camera supports implicit preview restart after image capture, then this sequence will be skipped in order to improve KPI. Change-Id: I13b52255f1aa82805a67ad688a9964f84a447d5a
* | | | Camera: Don't do cancel_af till all CBs are received in burst shotVijay kumar Tumati2014-01-071-2/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing cancel_af in the first jpeg CB while burst shot is going on, is changing the camera state to IDLE and allowing next takePicture() which is resulting in crash as this call reaches HAL when camera is in picture taking state. Change-Id: Idd146060a73161bcc30c34756fb53662bb1f0902 CRs-Fixed: 593352
* | | Merge "Camera: Enable module switcher on resume"Linux Build Service Account2013-12-201-0/+3
|\ \ \
| * | | Camera: Enable module switcher on resumeSuman Mukherjee2013-12-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For HDR mode, on pressing shutter key, module switcher icon will be turned off. That'll not be activated if user relaunch camera after pressing home key in HDR mode while capturing image. Enable switcher in UI on resuming camera module. Change-Id: I094f4941f87149e4c5b2393881ed5175c4388559 CRs-fixed: 580450
* | | | Merge "Camera: Avoid animating cature with decoded jpeg in long shot"Linux Build Service Account2013-12-201-1/+3
|\ \ \ \
| * | | | Camera: Avoid animating cature with decoded jpeg in long shotVijay kumar Tumati2013-12-201-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decoding full jpeg image and animating capture with that is causing lot of delays which effects long shot stability.This change avoids that. CRs-Fixed: 586568 Change-Id: I0133cc55e5efcc801dd9a98c289dec965aa35984
* | | | Merge "Camera: Add support for UbiFocus, ChromaFlash and OptiZoom."Linux Build Service Account2013-12-201-0/+51
|\ \ \ \ | |/ / / |/| | |
| * | | Camera: Add support for UbiFocus, ChromaFlash and OptiZoom.Ajit Singh Solanki2013-12-131-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add UI option in App to enable/disable UbiFocus, ChromaFlash and OptiZoom - App shows UI options for these features only when supported in HAL Change-Id: I924f97b2b510b351d9a8cb48a0aac6a4dc24ca10
* | | | Merge "Camera: Overrides the focus mode for ZSL"Linux Build Service Account2013-12-131-0/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera: Overrides the focus mode for ZSLEmilian Peev2013-12-131-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This modification will override the currently configured focus mode to CAF( if supported ) in case we switch to ZSL mode. In addition to that the client will not be able to change the focus mode once ZSL is active. - TouchAF will be available in ZSL mode if supported. - Moves focus option to the rest of the 3A modes. Change-Id: I4a2ab7d6013c26365cf46e7b3c5d2d0d3afd574e CRs-fixed: 522500,528835,585670
* | | | Merge commit 'android-4.4.2_r1' into merge_branchShruthi Krishna2013-12-111-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'android-4.4.2_r1': Reduce logging of flattened Preferences
| * | | | Reduce logging of flattened PreferencesSeth Raphael2013-12-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11901390 Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
* | | | | Merge "Camera: fix machine shot regression"Linux Build Service Account2013-12-101-1/+2
|\ \ \ \ \
| * | | | | Camera: fix machine shot regressionVijay kumar Tumati2013-12-061-1/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't do cancelAutoFocus in JPEG calback if it is machine shot. we need to do cancelAF in normal snapshot but not while machine shot. Change-Id: Ic85dbc67cdd2510eafbd849f0b6afa22e2801f7e CRs-Fixed: 585345
* | | | | Merge "Camera: Resume FD UI after capture in ZSL mode"Linux Build Service Account2013-12-071-0/+2
|\ \ \ \ \
| * | | | | Camera: Resume FD UI after capture in ZSL modeEmilian Peev2013-11-251-0/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AF sweep in ZSL mode normally will pause the FD UI. The UI should again be re-enabled. CRs-Fixed: 581180 Change-Id: Ic74973577835388a997d32e079151edec11f70c7
* | | | | Merge "Merge remote-tracking branch into merge_branch"Linux Build Service Account2013-12-071-25/+72
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-25/+72
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| | * / Delay onResume tasks to speed up lockscreenAndy Huibers2013-11-201-16/+28
| | |/ | | | | | | | | | | | | | | | | | | | | | onResume->onPause->onResume launch sequence. Bug: 11773268 Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3
| | * Merge "Add parameters and deduplicate parameter changes" into ↵Seth Raphael2013-11-131-1/+2
| | |\ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | | * Add parameters and deduplicate parameter changesSeth Raphael2013-11-121-1/+2
| | | | | | | | | | | | | | | | Bug: 11646117 Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e
| | * | Revert parallel opening camera in photo mode.Erin Dahlgren2013-11-121-167/+65
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts: * ag/386409 * ag/386206 * ag/385573 Bug: 11598948 Bug: 11625767 Bug: 11627454 Bug: 11255097 Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5
| | * Add logging to various actionsSeth Raphael2013-11-071-1/+2
| | | | | | | | | | | | | | | | | | Bug: 11514148 Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
| | * Ensure mOpenCameraThread has been setup before dereferencing.Ruben Brunk2013-11-071-7/+15
| | | | | | | | | | | | | | | Bug: 11579062 Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
| | * Fix photo mode is getting stuck in a single CameraState.Erin Dahlgren2013-11-071-6/+8
| | | | | | | | | | | | | | | Bug: 11574716 Change-Id: Ieb3622103798077071bb9350773851b7acbff756
| | * Parallelize opening the camera with view handling in photo mode.Erin Dahlgren2013-11-071-68/+171
| | | | | | | | | | | | | | | Bug: 11255097 Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
| | * Merge "camera: Ensure camera release for lockscreen transition." into ↵Ruben Brunk2013-11-061-1/+8
| | |\ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | | * camera: Ensure camera release for lockscreen transition.Ruben Brunk2013-11-051-1/+8
| | | | | | | | | | | | | | | | | | | | Bug: 11063890 Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b
| | * | Make sure preview aspect ratio is updatedDoris Liu2013-11-051-4/+5
| | |/ | | | | | | | | | | | | Bug: 11509233 Change-Id: Ide6f5bbe0abe7ed45e56b3f34c19204c1294afc7
| | * Check for media service being present before capture.Sascha Haeberling2013-11-041-0/+1
| | | | | | | | | | | | | | | | | | Bug: 11508325 Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
| | * Merge "Fix the mapping between preview UI and camera sensor" into ↵Doris Liu2013-10-291-2/+3
| | |\ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | | * Fix the mapping between preview UI and camera sensorDoris Liu2013-10-281-2/+3
| | | | | | | | | | | | | | | | | | | | Bug: 11409659 Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
| | * | Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbadztenghui2013-10-281-1/+1
| | |\ \
| | | * | Fix crash when trying to reopen the camera.ztenghui2013-10-281-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case, another app is using the Camera, such that the camera.open will hit an exception. We should show an dialog here. bug:11258139 Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
| | * / Update aspect ratio when preview aspect ratio changesDoris Liu2013-10-271-0/+4
| | |/ | | | | | | | | | | | | Bug: 11250125 Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
| | * Merge "Show a preview cover until real preview is ready" into ↵Doris Liu2013-10-171-0/+3
| | |\ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | | * Show a preview cover until real preview is readyDoris Liu2013-10-151-0/+3
| | | | | | | | | | | | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | | | Merge "Camera: Wait for focus to be done before starting long shot"Linux Build Service Account2013-12-051-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Camera: Wait for focus to be done before starting long shotVijay kumar Tumati2013-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier, when a machine shot is triggered, because camera in focusing mode, we were just exiting without taking longshot. This change fixes it. Change-Id: Ic21480fbcb5d46cddfb837e67e108709db5c0d55
* | | | Merge "Camera: Fix instability during ZSL snapshot"Linux Build Service Account2013-11-231-3/+13
|\ \ \ \
| * | | | Camera: Fix instability during ZSL snapshotEmilian Peev2013-11-171-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AF(for instance touch AF) could be started during ZSL mode. Currently the application will not wait for AF callback to come before proceeding with the snapshot. This depending on timing will lead to inconsistent camera application state where an AF callback could arrive during image capture and override the current state machine allowing the client to trigger capture again. The second capture will fail causing an exception. - This patch will not let the camera application trigger snapshot when AF is still running during ZSL. Additionally it will unlock CAF after capture is done through a call to 'cancelAutoFocus()'. Change-Id: Id5ae8ff0b7c1576ac7c6221f09837929aefcea17 CRs-Fixed: 572996, 564453
* | | | | Merge "Update face detection start state based on zsl or normal mode."Linux Build Service Account2013-11-221-1/+3
|\ \ \ \ \
| * | | | | Update face detection start state based on zsl or normal mode.Santhosh Kumar H E2013-11-201-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While capturing image state of face detection start variable was set to false. This is because in normal capture mode, preview will be restarted after image capture during which face detection will be started again. In case of zsl mode, variable state was set to false though preview is not restarted. So when user uncheck face detection option, control was returning without clearing face data. This check makes sure the state is updated only in non ZSL mode. Change-Id: I66ad64d17011a25f0d02e77334392f5d3b0abd77 CRs-Fixed: 566252
* | | | | Merge "Update preview as per aspect ratio on back key press."Linux Build Service Account2013-11-221-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-19 21:39:09 +0000