summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
Commit message (Collapse)AuthorAgeFilesLines
* snap: Improve transitionsSteve Kondik2016-11-171-5/+2
| | | | | | | | * Synchronize animation to filmstrip with input * More code cleanups, introduce BaseModule * Animations are hard Change-Id: Ie664bb2059a28b3a9f3957fb491ec28fede521e5
* snap: Use new widgets for CaptureUISteve Kondik2016-11-141-59/+5
| | | | Change-Id: I1d142d60af3f51c71ce3711642d074faf7b456c2
* snap: UI checkpoint #2Steve Kondik2016-11-131-2/+2
| | | | | | | | | | * Fix bugs from previous commit * Factor out recording controls * Clean up layouts * Asynchronous control for video module * Performance improvements Change-Id: I9d5833cecbd9280845b740ee8a3c47f023470625
* snap: Better capture animationSteve Kondik2016-11-131-0/+4
| | | | | | | * Modified version from Camera2 * Also adjust the callbacks for better response Change-Id: I85ac23cdf35d9e2625799dd64b9f86aef103be7b
* snap: UX improvements v1Steve Kondik2016-11-131-90/+14
| | | | | | | | | | | | | * 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
* Reenable left swipe for FilmstripSteve Kondik2016-11-091-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Drop new focus indicator into Camera2.Paul Rohde2016-11-021-78/+20
| | | | | | | * 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
* SnapdragonCamera: Fix focus indicator for UNFOCUSED stateByunghun Jeon2016-09-271-0/+2
| | | | | | | | When UNFOCUSED state is reached show red focus indicator. Also added with a timeout so that it will go away automatically. Change-Id: I76360967cb3419b261ee3a265070543424e6ab83 CRs-Fixed: 1055830
* Merge "SnapdragonCamera:Fix instance of SettingsManager is null" into ↵Camera Software Integration2016-09-231-1/+1
|\ | | | | | | camera.lnx.1.0.c7-dev
| * SnapdragonCamera:Fix instance of SettingsManager is nulljunjiez2016-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | When there are two CameraActivities, one of them is destroyed, the instance of settingsManager will be destroyed too. When the other CameraActivity invokes SettingsManager.getInstance(), it may return null and cause exceptions.Create and hold a instance of SettingsManager in each CameraActivity to make sure it's not null. Change-Id: Id2c355bf63f61e09f914113082db2876f28b9658 CRs-Fixed: 1060909
* | Merge "SnapdragonCamera: Fix Camera launch latency" into camera.lnx.1.0.c7-devCamera Software Integration2016-09-171-1/+1
|\ \
| * | SnapdragonCamera: Fix Camera launch latencyByunghun Jeon2016-09-131-1/+1
| |/ | | | | | | | | | | | | | | Call setModuleFromIndex() first before calling setContentView() so that camera open will happen faster Move query() cursor after setModuleFromIndex() Change-Id: I8407cb795248f4b814d8292014b6ddc79d2af7f8
* / SnapdragonCamera: Mono preview visibility change on pauseJack Yoo2016-09-121-0/+1
|/ | | | | | | | Change mono surface visibility on pause explicitly for camera2 to camera1 change case. Change-Id: I398ed7936c3edc9a5138d88c78fa0a20e11d4a9f CRs-Fixed: 1047291
* SnapdragonCamera: Add shutter sound to camera2Byunghun Jeon2016-08-161-1/+2
| | | | | | | | Add shutter sound menu to settings and allow user to turn on/off shutter sound in camera2 mode CRs-Fixed: 1050117 Change-Id: I624f28428415b8dde7da6e4908c26dd59bb3fbdb
* SnapdragonCamera: Expose the Video time lapse optionByunghun Jeon2016-08-161-3/+3
| | | | | | | Move time lapse option from developer menu to normal menu Change-Id: Ifd8720b0a01273f402847ed4f6681678a366e13f CRs-Fixed: 1019192
* SnapdragonCamera: Add selfie flash to camera2Byunghun Jeon2016-08-161-0/+31
| | | | | | | Add selfie flash to camera2 CRs-Fixed: 1047161 Change-Id: I2ee7033d7854bb15fb9eabe215aaf063b440aee4
* SnapdragonCamera: Add High Framerate Video captureByunghun Jeon2016-08-161-0/+1
| | | | | | | | Add high framerate video capture. Only show supported options for current video size. CRs-Fixed: 1045405 Change-Id: Ib0dd7e63c167ead0fd734382d3ad4fdc7a64f8cc
* SnapdragonCamera: Saving MPO and DDM without CSJay Wang2016-07-261-0/+1
| | | | | | | Saving MPO and DDM without CS CRs-Fixed: 993611 Change-Id: Ie04bce460c57454b4cf57c88b47ef2a495b6e078
* Merge "SnapdragonCamera: Remove custom location permission request window" ↵Linux Build Service Account2016-07-251-11/+0
|\ | | | | | | into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Remove custom location permission request windowJay Wang2016-07-191-11/+0
| | | | | | | | | | | | | | | | When user enables the GPS locaion setting, use Android's run-time permission request interface to get the permission. Change-Id: Ib17171aeff5ccf20e2b00da08243dee1a3383611 CRs-Fixed: 1038039
* | SnapdragonCamera: Replacing mono surfaceJack Yoo2016-07-071-52/+110
| | | | | | | | | | | | | | Replacing mono surface to allocation dummy surface Change-Id: I8ed7396e6bee7fd34e223f285c0d9693ff04527a CRs-Fixed: 1035245
* | SnapdragonCamera: Adding ubifocus post proc filterJack Yoo2016-07-071-5/+11
| | | | | | | | | | | | | | Introducing ubifocus to camera2. Change-Id: I611bea207b9cbbde56a23720b22a5a5e3daa215f CRs-Fixed: 1035245
* | SnapdragonCamera: FrameListener and Video frame processorJack Yoo2016-07-071-6/+42
|/ | | | | | | | Adding FrameListener with TrackingFocus Adding VideoFrameProcessor with beautification Change-Id: Id51a0417af43140ed27ea5859ff939adc2e78c43 CRs-Fixed: 1035245
* SnapdragonCamera: Allow take snapshot while recording videoByunghun Jeon2016-06-291-3/+2
| | | | | | | | Allow take snapshot while recording video by showing shutter button. Directly call capture when shutter button is pressed. Change-Id: Iae4d42d8878ea82b459ec67709b0ad8e340c8226 CRs-Fixed: 1028463
* SnapdragonCamera: Add face detection to camera2Byunghun Jeon2016-06-291-3/+56
| | | | | | | | Add face detection to camera2. Receive face data from camera2 and use faceView UI to draw it Change-Id: Id9c49ab6dd73de316398c57981cc0b9df0400b45 CRs-Fixed: 1025797
* SnapdragonCamera: Add video to Camera2 moduleByunghun Jeon2016-06-291-8/+154
| | | | | | Add video to Camera2 module and combine the UI Change-Id: I0bcd86eb6b95fe2180856780ddd794682259e799
* SnapdragonCamera: fix front back camera toggle crashJay Wang2016-06-211-4/+25
| | | | | | | | | | | - Fix logic when switching camera id from front to back in dual camera setup. - Only init Clearsight once. - Wait for second surface for aux camera to become ready before attempting to create session. CRs-Fixed: 993611 Change-Id: Icec4af06535f29bc75790b1d57eed212f7a86727
* SnapdragonCamera: Add redeye reductionByunghun Jeon2016-06-091-0/+1
| | | | | | | Add redeye reduction to Camera2 Change-Id: Iae4beb9287a0a927330ba987238fac6a2dae058e CRs-Fixed: 1018118
* SnapdragonCamera: FrameProcessorJack Yoo2016-06-011-1/+2
| | | | | | | Introducing Frameprocessor with beautifiation. Change-Id: Ie6d8f4157a7d0c1a21e6f347457e84685e397286 CRs-Fixed: 1023183
* SnapdragonCamera: Fix front camera and scene mode picture taking issuesByunghun Jeon2016-05-311-2/+7
| | | | | | | | | | | Fix front camera picture taking issues. Fix scene mode picture taking issues. For both front camera and scene mode issue, focus state was not updating properly so it was stuck waiting for focus to finish. So added another logic to check such case and continue to next step. Change-Id: I99d2164a77cc2903f3df50c7ff9478e718b112c0 CRs-Fixed: 1018118
* SnapdragonCamera: Show popup and close when createSession failsByunghun Jeon2016-05-311-12/+11
| | | | | | | | Show popup and close the app when createSession fails. Also modify camera mode related function names. Change-Id: I859af7f0a4e9be86fc8599ff0c3778e5f52f6d0b CRs-Fixed: 1018118
* SnapdragonCamera: Update settingsManager and add Dual mode to Scene modeByunghun Jeon2016-05-311-34/+45
| | | | | | | Update settingsManager and add Dual mode to Scene mode Change-Id: I508430840c3fb8c7d0b56a2a63e09b271754fcb4 CRs-Fixed: 1018118
* SnapdragonCamera: Add continuous shot and count downByunghun Jeon2016-05-311-8/+61
| | | | | | | Add continous shot and count down to CaptureModule Change-Id: I986302201f742d7671a67c26953eecc2a0276294 CRs-Fixed: 1018118
* SnapdragonCamera: Add ISO and exposureByunghun Jeon2016-05-311-0/+4
| | | | | | | Add ISO and exposure to CaptureModule Change-Id: If6f3c142bcfbbcc049c10d7be2fe5a4c86d31fe6 CRs-Fixed: 1018118
* SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-311-411/+956
| | | | | | | | | | | Add SettingsManager to work as a database for settings. It will handle all dependencies and populate the values. Add scene mode and filter. Restructure UI and menu by combining them and leave the handling of settings to SettingsManager Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88 CRs-Fixed: 1018118
* SnapdragonCamera: Camera2 add touch to focusByunghun Jeon2016-03-301-1/+19
| | | | | | | Add touch to focus to Camera2 CRs-Fixed: 989750 Change-Id: I5c7c85dcc12eefb11e5f1b5e6a823a327b2647e4
* SnapdragonCamera: Camera2 add zoom supportByunghun Jeon2016-03-301-17/+27
| | | | | | | Add zoom support to Camera2 CRs-Fixed: 989750 Change-Id: Id6b558ff5215f04ca7c201b1d1807521d615c353
* SnapdragonCamera: Camera2 add flash, jpeg quality, white balanceByunghun Jeon2016-03-301-9/+8
| | | | | | | Add flash, jpeg quality, and white balance setting menus to Camera2 CRs-Fixed: 989750 Change-Id: I288e1d4378c5e9f471b2b48a6c11ef434a9bac47
* SnapdragonCamera: Camera2 add dual cameraByunghun Jeon2016-03-301-5/+13
| | | | | | | Add Camera2 dual camera support to SnapdragonCamera CRs-Fixed: 989750 Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e
* SnapdragonCamera: Add Camera2 modeByunghun Jeon2016-03-301-802/+139
| | | | | | | Use camera2 API to show preview and take snapshot CRs-Fixed: 989750 Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
* SnapdragonCamera: create base files for camera2 APIJay Wang2016-03-301-0/+1463
All the new files are copied from the commit : f3448373ef3c92b492ac65a9b4008d45a51f88ee res/layout/capture_module.xml copied from res/layout/photo_module.xml src/com/android/camera/CaptureMenu.java copied from src/com/android/camera/PhotoMenu.java src/com/android/camera/CaptureModule.java copied from src/com/android/camera/PhotoModule.java src/com/android/camera/CaptureUI.java copied from src/com/android/camera/PhotoUI.java CRs-Fixed: 989750 Change-Id: I4a97975ed5847d9025f9ff8e8fcbcbeaedd49e16
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 10:35:26 +0000