summaryrefslogtreecommitdiff
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Camera: Handle keys only while in app" into cm-11.0Abhisek Devkota2014-02-071-10/+7
|\ \
| * | Camera: Handle keys only while in appMichael Bestas2014-02-021-10/+7
| | | | | | | | | | | | | | | | | | Thanks to Lars Greiss (SlimRoms) Change-Id: I63f757d25260fba4683f494f8b4daf178a2b4e13
* | | Merge "Camera: Cleanup hardware key handling" into cm-11.0Abhisek Devkota2014-02-071-4/+17
|\| |
| * | Camera: Cleanup hardware key handlingMichael Bestas2014-02-021-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix power shutter behaviour in camcorder mode * Disable volume change while in panorama mode, volume buttons should only handle camera operations while in the camera * Add camera/power/volume key shutter handling in panorama mode On devices with a hardware camera key: * Disable power & volume shutter features * Volume buttons control the zoom On devices without a hardware camera key: * When power shutter is disabled, volume buttons control the shutter (like AOSP) * When power shutter is enabled, volume buttons control the zoom Change-Id: I141946d5b6f5aec8b1e9a9f99270d30295596079
* | | Merge "Camera: Powerkey shutter (2/2)" into cm-11.0Abhisek Devkota2014-02-071-0/+25
|\| |
| * | Camera: Powerkey shutter (2/2)Michael Bestas2014-02-021-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ported from cm-10.1 Including cm-10.1 camera commit: aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization. Includes http://review.cyanogenmod.org/56986 PS2: Make Camera2 a privileged app PS5: Sign with platform certificate instead of making it a privileged app. PS6: Add write permission to PREVENT_POWER_KEY PS7: Move PREVENT_POWER_KEY permission to CameraActivity PS8: Revert to PS5 Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
* | | Camera: fix crash on screen off-on on preview screenPawit Pornkitprasan2014-02-021-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | Some Camera HALs don't like stopPreview being called with setPreviewTexture set to null. Problem occurs on: - Acer A700 (Tegra 3) - always - Samsung I9082 (Broadcom) - sometimes Change-Id: Ifd5375d69ef9851a058d2385bf2ee9c89e85bae0
* | Camera: Add Burst modeMichael Bestas2014-01-301-4/+26
| | | | | | | | Change-Id: I867e26a359ae11b82637d9d239a49679b7e0eb76
* | Storage configuration options (1/2)Scott Warner2014-01-131-2/+12
| | | | | | | | | | | | | | | | | | | | This allows the user to change the default storage path from the standard internal storage to any available external storage. When the path is changed, it sends an intent to the gallery application to keep the paths in sync (Requires part 2 in Gallery2) Change-Id: I1dbd1161230ad1d48440c6c3a29841c5c486a905
* | Camera2: bring back support for Samsung HDR formatShareef Ali2014-01-061-17/+69
| | | | | | | | Change-Id: I01e81f347228617b892598ea0d4f80f818bf17d0
* | Camera: Change volume hard key button to zoom functionSu Liu2014-01-041-5/+11
| | | | | | | | | | | | | | | | Able to capture image through volume hard key button in camera application, change the function to zoom function. Change-Id: Iab9fc2492b2e2ff89cd58c21bac2f147f47b77e2
* | camera: Keep touch focus intact during back-to-back ZSL shotsSteve Kondik2014-01-041-2/+2
| | | | | | | | | | | | | | | | * If ZSL is enabled, we should not resetTouchFocus between shots. * Instead, re-kick the timer for each shot. If I set a focus point, I want that point to stick while I take a succession of shots. Change-Id: I407bb1e248cc902355d0294f47b071cc8a32fac3
* | Camera: Enable module switcher on resumeSuman Mukherjee2014-01-021-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
* | Camera2: fix long press shutter behaviorPawit Pornkitprasan2014-01-021-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | Long press shutter should perform auto focus and take the photo when the shutter is released. This behavior is broken in f5b1181157b6d7f65376c0068768f8f3f94b5d69 when longshot/burst mode is added by CAF. Fix by only setting the long click handler for longshot/burst when it is enabled. Change-Id: I5149134641ec790c03857b4ea23c43a9ff0adfda
* | camera: Actually fix ZSL :)Steve Kondik2013-12-291-3/+3
| | | | | | | | Change-Id: I921c10e2dfd8694fc13ba8bc9def59c498322f4f
* | Camera2: More thorough compatibility fixesRyuinferno2013-12-291-3/+6
| | | | | | | | | | | | | | Certain chipsets (such as omap) have contrast, sharpness and saturation set, but no max integer given for those Change-Id: I58efaef4d0a511aefc803a440e0c3aa3dbdc9483
* | Camera2: Preview needs to be stopped when changing resolutionPawit Pornkitprasan2013-12-261-0/+6
| | | | | | | | | | | | | | | | This was done in startPreview as a hack, but was removed in f729b85e12cfa2674048d8cce2f724014b8fc910. Specifically add it back when the resolution is changed. Change-Id: I306abd788bafdff4e6fba7eec4e6ff05bb3cc47c
* | camera: ZSL and focus fixesSteve Kondik2013-12-251-105/+22
| | | | | | | | | | | | | | | | | | * Drop the use of the touchaf-aec parameter entirely. No camera needs this anymore. * Only autofocus before a snap if we are actually in "auto" mode. * Change ZSL from a preference to an overlay boolean. Change-Id: Ia94b6f7b7b6283facd7bb22db80e3eb389d136da
* | camera: Support for HTC's HDR modeSteve Kondik2013-12-231-10/+6
| | | | | | | | | | | | | | | | | | | | * HDR was never actually working on CM because we did not instruct the camera to take all exposures. The HAL tells us that we'll get one JPEG, but we should snap 3 times. We handle this behavior in the framework now, but we should honor the num-jpegs-per-shutter value in the JPEG callback. Change-Id: I7124bf08985ae23b21ac4e294fb889ac4106946b
* | camera: Remove ICS hack to stop preview after takePictureSteve Kondik2013-12-211-6/+0
| | | | | | | | Change-Id: Idcecfc6399421bd5dc25dcf79548949cdd14621f
* | camera: Forward-porting CM featuresSteve Kondik2013-12-161-7/+55
| | | | | | | | | | | | | | | | | | * ASD, slow shutter, beautify, focus time, etc * New menu structure * Includes work from Steve Kondik, Ethan Chen, jt1134, Michael Bestas Change-Id: I73cf1e685ab2d55579d4b85f39916b59435e6569
* | camera: Remove the luma-adaptation seekbarSteve Kondik2013-12-141-71/+3
| | | | | | | | | | | | * Not useful for any hardware I have encountered. Change-Id: I93cca2b3bf907cc01946a55111de9eb883475d24
* | camera: Cleanup and compatibility fixesSteve Kondik2013-12-141-30/+48
| | | | | | | | | | | | | | * Don't crash for unavailable integer parameters * Kill logspam Change-Id: I6dbcf5560f96ce6173a847501721f589766889bc
* | camera: Add parameter debugging supportSteve Kondik2013-12-141-0/+1
| | | | | | | | Change-Id: Ifc1653f0046af169ba36d94796b4d9a3055c6798
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-14 15:44:03 +0000