summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
* snap: Improve the histogramSteve Kondik2016-11-171-0/+1
| | | | | | | * Make it work with the new UI * Make it pretty Change-Id: Ib920307639f997c82ed003e0712fb28e9912a8e8
* Remove unused menu indicators code.Danny Baumann2016-11-171-6/+0
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* snap: Improve transitionsSteve Kondik2016-11-171-24/+4
| | | | | | | | * Synchronize animation to filmstrip with input * More code cleanups, introduce BaseModule * Animations are hard Change-Id: Ie664bb2059a28b3a9f3957fb491ec28fede521e5
* snap: Check for null when setting up the focus callbackSteve Kondik2016-11-141-7/+9
| | | | | | | | * Depending on phase of moon and location of Jupiter, we might race during startup. Add a nullcheck and synchronize until we have a proper callback. Change-Id: I2d026f0eaae3541f78c105e8cb03ae38195f48ba
* SnapdragonCamera: Fix ANR during open cameraqimengp2016-11-131-0/+0
| | | | | | | | | | | When preview UI destory, app call Camera API as order: setPreviewDispaly(null) and stopPreview(). In case native window disconnected before stopPreview(), will cause ANR, since calling to native window fails. Native window is taken care within camera framework. So, by removing setPreviewDisplay(null), can avoid this issue. Change-Id: Id804f2e0876a61d974e58dd996c46fe769f69856
* snap: UI checkpoint #2Steve Kondik2016-11-131-1/+4
| | | | | | | | | | * Fix bugs from previous commit * Factor out recording controls * Clean up layouts * Asynchronous control for video module * Performance improvements Change-Id: I9d5833cecbd9280845b740ee8a3c47f023470625
* snap: Use reveal animation when switching modesSteve Kondik2016-11-131-2/+7
| | | | Change-Id: I7a4b4fe2c29426b57020e3a5102d89b62d46c241
* snap: Better capture animationSteve Kondik2016-11-131-3/+10
| | | | | | | * Modified version from Camera2 * Also adjust the callbacks for better response Change-Id: I85ac23cdf35d9e2625799dd64b9f86aef103be7b
* snap: UX improvements v1Steve Kondik2016-11-131-4/+1
| | | | | | | | | | | | | * Make the camera controls do sane things- get rid of the manual placement of every widget and use layouts * Animate everything correctly * Show ripples when clicking the shutter * Clean up a metric ton of dead code * Moved more code into BaseUI * Make setting up the camera controls less verbose and magical * Fixed up panorama layout Change-Id: Iaed44ca0201a2e2641e1c2460d3ff9ec3eae2d85
* snap: Get rid of static Context memberSteve Kondik2016-11-111-18/+9
| | | | | | | * These are never a good thing. Instead pass the activity thru CameraUtil. Change-Id: I30d73fa329e174b20e0075a49e6d1e059e30aa3e
* Reenable left swipe for FilmstripSteve Kondik2016-11-091-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * These commits are from the CameraNext application in COS. * Credits: Ed Carrigan, Ed Mancebo, Wilhelm Fitzpatrick Revert "SnapdragonCamera: Fix preview broken when coming back from gallery" This reverts commit 5b8948f83a65e8f9bd1b419bd11511e48dc34887. Revert "SnapdragonCamera: fix crash after photo deletion" This reverts commit 171d2b253a752ca104ccf4a58f4e9d6d82bd7b28. CameraNext: Fix camera crash on device unlock This patch from the plugin branch also fixes CYNGNOS-1878 Due to the bug below, when the camera is fore-grounded when device is unlocked, the SurfaceView is getting recreated, which caused it to be in a weird state when we were trying to reattach the preview to it. ----- Fixed Black Screen On Back. The issue was that mCameraView was not being populated when it should have been (after it had been added to the view hierarchy). The problem was the SurfaceView was being removed from the hierarchy when it shouldn't have been. Issue-Id: CP-129 (cherry picked from commit 4010462fe0b4cf1c15624cfca7d6a3d4d380613a) CameraNext: avoid scaling camera preview in filmstrip (cherry picked from commit 823ed983c4dccac3959635f1a14fcfe47cd7b120) CameraNext: fade camera preview to black during film strip transition Instead of scaling and translating the camera preview to make room for film strip images, we leave the preview in place and cover it gradually with the black preview cover. CameraNext : Add offset calculation for left navbar Also prevent preview from translating while hidden - was causing occasional glimpses of it in filmstrip. CameraNext : Ensure vertical/horizontal swipes don't conflict Ensure that the user can't swipe horizontally while trying to delete the image. Avoids all sorts of synching issues between mViewItem and the data adapter since the buffer is trying to constantly keep its center to be the current visible item CYNGNOS-1069 CameraNext: fix crash on entering filmstrip via thumbnail tap mVerticalViewId was getting initialized in onUp, but if filmstrip was entered without a swipe, no onUp occurred. Fixed by directly initializing the field on object creation. CameraNext: Fix ZoomView in the filmstrip The ZoomView was getting covered in the Z axis while scrolling. issue-id: SAMBAR-862 Revert "SnapdragonCamera: fix camera preview broken when resume from gallery" This reverts commit 0acc1f027637c4f0126883be68f97817d7306032. Change-Id: If4dd591c5c752a7fa33c669c15875c0077446a37
* snap: Fix advanced modes and focus overrideSteve Kondik2016-11-071-16/+24
| | | | | | | * Always allow touch focus * Set the scene mode correctly during advanced modes Change-Id: I58ad050e90578e9d23102001da2f980498b8c774
* Protect against multiple shutter callbacks per frame in longshot mode.Danny Baumann2016-11-071-0/+8
| | | | | | | | | | Some devices send multiple shutter callbacks for one captured frame in longshot mode. As this causes mismatch between the calculated number of captured frames and the calculated number of JPEGs received for those, which in turn leads to longshot mode never being ended properly, protect against that scenario by discarding all but the first callback. Change-Id: I0c3a270f664a0cd16354fb0a13c5941a52001650
* SnapdragonCamera: Longshot with Burst Functionality.Vijay kumar Tumati2016-11-071-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new Longshot feature where in the snapshot frames captured at ISP is @ 3fps and output JPEG encoded rate is @ 1.2 fps. This can be enabled by setting following setprop with the maximum number of snapshots. adb shell setprop persist.camera.longshot.max <max_number> e.g.:adb shell setprop persist.camera.longshot.max 10 If the number is -1, then the existing Longshot will be used. Main changes: 1) The number of Snapshot/Preview/Metadata buffers are increased to make sure no frames will be dropped @ ISP and to maintain burst fps. e.g.: For max number of 10 snapshots, Snapshot buffers are increased to 9 from existing 6. This buffer numbers are derived considering snapshot YUV frames @ 3 fps and JPEG encoding @ 1.2 fps. 2) Shutter will be played after receiving YUV frame instead of reprocess frame. 3) New Longshot stop command is sent after receiving all the required YUV callbacks or releasing the shutter before reaching Max number. 4) Existing Longshot off command is sent after receiving all JPEG CB.s for the issued TakePictures() and also shutter button will be disabled until all the JPEG callbacks are received. Change-Id: Id0c21aeb67245530768bf3ab859d39dea7e2bc40
* Fix up layout of auto HDR notice and histogram view.Danny Baumann2016-11-021-238/+30
| | | | Change-Id: I61f93c68b52d81c5e19919a5b0b894cf51dd35c4
* snap: Additional fixes for auto-HDR modeSteve Kondik2016-11-021-26/+40
| | | | Change-Id: I0d9b982dc9d817b40d59fc5fa58d542a213a3d1f
* snap: Fixes for advanced features and scene modesSteve Kondik2016-11-021-36/+31
| | | | | | | | * Get rid of the annoying toast when longshot is disabled * Add support for ChromaFlash as a scene mode * Adjust overrides for various scene modes Change-Id: Ifda1990f4e9b3435655664f2a6c2b31fc3ae23fa
* snap: Add constrained longshot modeSteve Kondik2016-11-021-1/+20
| | | | | | | | | * On the OP3, we can only use Longshot in a single scene mode without conflicting with other built-in postprocessing features which cannot be disabled. Add support for this. When a scene specified in the longshot-scenemodes list is active, continuous shot will be enabled. Change-Id: I79878e5ac918e907ddc5b3ca168e49f4e06656c3
* snap: Always turn touch-af-aec onSteve Kondik2016-11-021-0/+6
| | | | | | | | * Most cameras do this by default, but on at least one device it starts with the option disabled. This stops AEC from updating during touch focus. Change-Id: I4bdb6cdbad86f3798c0288d6a32b7e8062e297f3
* Snap: Unbreak auto-HDRSteve Kondik2016-11-021-1/+1
| | | | Change-Id: Id93d5807fb4c4d14eeea33be0776a6f705a6c435
* Snap: force enable zsl for lge hdrcodeworkx2016-11-021-0/+5
| | | | | | LGE HDR needs ZSL enabled Change-Id: I563b7f7cd49fcf8aad35ca4b93f839dc0a591f01
* Snap: Only set preferred preview sizes if they are validEthan Chen2016-11-021-2/+6
| | | | | | * Check if a preferred photo preview size is valid before using it. Change-Id: Ia9580b68b60df9784f657df16b317748ff40a696
* Snap: Support override maker and model exif tagKetut Putu Kumajaya2016-11-021-1/+15
| | | | | | Camera HAL not always return proper values Change-Id: Id81fe40ac84b0ffb70560e55077d90544139e463
* Snap: Add support for focus distanceSteve Kondik2016-11-021-0/+19
| | | | | | * Hook up available metadata to the new focus manager. Change-Id: I793df67a2682d8bb2dee994193111227dd8c8d5a
* Snap: Do not crash when cur-focus-scale is nullLuK13372016-11-021-2/+10
| | | | | | | * Some cameras simply don't set this parameter. * Also set cur-focus-diopter to 0 if it's null. Change-Id: Ib1049012de9a58279560c14ed77f83f52c07fe30
* Snap: fix camera hang on LGE G4 when flash got usedcodeworkx2016-11-021-3/+10
| | | | Change-Id: I23e53333a0bbe2a12e64e87ec8594aeaa503e9fc
* camera: Keep touch focus intact during back-to-back ZSL shotsSteve Kondik2016-11-021-1/+1
| | | | | | | | * 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
* Snap: Fix crash when set infinite touch-focus durationMichael Bestas2016-11-021-1/+1
| | | | | | | * java.lang.Integer.valueOf(string) method can't parse hexadecimal values Change-Id: I42706db72fc9c1093a7aa16440af449f731e5176
* SnapdragonCamera: Set camera parameters before restarting previewSultanxda2016-11-021-0/+1
| | | | | | | | | Ensure that all of the updated camera parameters are propagated to the camera HAL prior to restarting the preview. This fixes the split-exposure observed when turning ZSL off and on without exiting the app. Change-Id: I392549ae7cc75b150e01cf8b635d2e3f1ad6ffb9 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* SnapdragonCamera: Unlock AE/AWB after taking a photo with ZSLSultanxda2016-11-021-0/+1
| | | | | | | | | The exposure and white balance get stuck after taking photos with ZSL. Always unlock the exposure and white balance after taking photos with ZSL. Change-Id: Ia34a54522048fdd619f44ac1f6d2924ce2c3fc6a
* SnapdragonCamera: Add focus-mode option to camcorderSultanxda2016-11-021-14/+14
| | | | | | | User can now control the focus mode used while recording video. Change-Id: I340c01a3f88314de67ca024279672276eff453ed Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Snap: do not restart preview during longshotscodeworkx2016-11-021-8/+9
| | | | Change-Id: I6ad439dc0be7c6e0d13ac7c22aacdc0ad559d051
* Snap: Don't enable ZSL when disabling HDRGabriele M2016-11-021-1/+2
| | | | | | | Instead, restore the default value. This prevents issues on devices that don't support ZSL. Change-Id: I9c456cd6503df29800e2bc7ccaa691cb3fb42681
* Drop new focus indicator into Camera2.Paul Rohde2016-11-021-23/+5
| | | | | | | * 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: Support for HTC's HDR modeSteve Kondik2016-11-021-10/+2
| | | | | | | | | | * 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
* Snap: special handling of hdr-mode parameter for lge devicescodeworkx2016-11-021-16/+38
| | | | Change-Id: Iefee1f15f5649c2f93c59fcbdedcf953e9e0bc54
* Don't do touch-to-focus for touches outside of the preview.Danny Baumann2016-11-021-6/+0
| | | | | | | | | | Issue was twofold: - Preview size was updated from the root view instead of the preview surface view. As the preview rect is already correctly updated from the surface view, remove the redundant size update code. - Touches outside of the preview rect weren't discarded properly. Change-Id: I1c9a4398aa51a828b5362fcd7bcd5a7a7e4691db
* Move mApplicationContext to init()LuK13372016-11-021-2/+1
| | | | | | | | | | | | | | Fixes following NPE: 01-11 17:36:42.607 4329 4391 E AndroidRuntime: FATAL EXCEPTION: Thread-235 01-11 17:36:42.607 4329 4391 E AndroidRuntime: Process: org.cyanogenmod.snap, PID: 4329 01-11 17:36:42.607 4329 4391 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'android.content.res.Resources android.content.Context.getResources()' on a null object reference 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.updateCameraParametersPreference(PhotoModule.java:3492) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.setCameraParameters(PhotoModule.java:3714) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.startPreview(PhotoModule.java:2715) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.-wrap14(PhotoModule.java) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule$OpenCameraThread.run(PhotoModule.java:265) Change-Id: I6ca0dfe402cab46dd7b6f102921062f3c7ec8d43
* Snap: support setting default preview resolution via overlaycodeworkx2016-11-021-43/+13
| | | | Change-Id: I14c17aec6e5d582cc1f884eba40868a58cab1d03
* Snap: support usage of preview size 2560x1440 via system propcodeworkx2016-11-021-0/+7
| | | | Change-Id: I52b0f7aab55d0a001fc1149fbd82c8188f57be9d
* Snap: initial materializationjrizzoli2016-11-021-7/+7
| | | | | | | Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
* Snap: fix typo in PhotoModulecodeworkx2016-11-021-1/+0
| | | | Change-Id: Ied37999553d04dcc970da23ccce4dd7c9abf3b48
* Snap: 100 chars!codeworkx2016-11-021-1/+2
| | | | Change-Id: Ia48f48fcd8b8546ca68969198a60f568bae805d6
* Snap: restart preview when shutter-speed gets disabledcodeworkx2016-11-021-1/+13
| | | | Change-Id: I3884b23f1c855cfffeb20ca6e2a760732370d772
* Snap: add support for mw_continuous-picture focus modecodeworkx2016-11-021-12/+26
| | | | Change-Id: If165370b52d7454c69e2cdeb9d837d049010b0e8
* Snap: add support for shutter speedcodeworkx2016-11-021-0/+9
| | | | Change-Id: Id3393280c7c1c2f292d71587ba099e8dbafd1340
* add options to restart preview onPictureTakencodeworkx2016-11-021-0/+17
| | | | Change-Id: I7ce9d6f2323e367743e6d4c9662b846d3052f2a4
* add support for luminance-condition parametercodeworkx2016-11-021-0/+12
| | | | Change-Id: Idf845a5f55abf9b72f61ac4bac59ee2258043482
* add support for non-standard iso keys and valuescodeworkx2016-11-021-7/+7
| | | | Change-Id: I3a948495cdf84dae3c1734d50ff91b4a5d3d9fc0
* Snap: Add touch-to-focus timeout duration settingsjt11342016-11-021-0/+5
| | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 11:50:08 +0000