summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused menu indicators code.Danny Baumann2016-11-171-43/+0
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* snap: Improve transitionsSteve Kondik2016-11-171-7/+3
| | | | | | | | * 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-2/+2
| | | | Change-Id: I1d142d60af3f51c71ce3711642d074faf7b456c2
* snap: UI checkpoint #2Steve Kondik2016-11-131-8/+5
| | | | | | | | | | * 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-8/+2
| | | | | | | * Modified version from Camera2 * Also adjust the callbacks for better response Change-Id: I85ac23cdf35d9e2625799dd64b9f86aef103be7b
* snap: UX improvements v1Steve Kondik2016-11-131-121/+19
| | | | | | | | | | | | | * 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-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Fix up layout of auto HDR notice and histogram view.Danny Baumann2016-11-021-0/+12
| | | | Change-Id: I61f93c68b52d81c5e19919a5b0b894cf51dd35c4
* Snap: Add support for focus distanceSteve Kondik2016-11-021-1/+0
| | | | | | * Hook up available metadata to the new focus manager. Change-Id: I793df67a2682d8bb2dee994193111227dd8c8d5a
* Snap: Fix incorrect preview layout surface size in landscape modeNikita2016-11-021-4/+9
| | | | | | If height is smaller than width it means that orientation sets to horizontal and we should decrease width instead height to get normal preview size. Change-Id: Ifa211ad2604fb730fb85b01ae1d7c93c9b7aa2ce
* De-uglify menu.Danny Baumann2016-11-021-2/+3
| | | | Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761
* Avoid static member variable.Danny Baumann2016-11-021-0/+4
| | | | Change-Id: I3758bb219552d22768afa0af83c69c6a5460693b
* SnapdragonCamera: Fix UI alignment glitches when nav-bar is enabledSultanxda2016-11-021-1/+1
| | | | | | | | | Snapdragon Camera is immersive (i.e. fullscreen), so we expect to receive the actual size of the display here, not the modified size when the nav-bar is enabled. Change-Id: I942829f77dda0dbb9dd65a60e66a540eecf708e7 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Drop new focus indicator into Camera2.Paul Rohde2016-11-021-58/+19
| | | | | | | * 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: initial materializationjrizzoli2016-11-021-6/+0
| | | | | | | Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
* Camera2: tweak volume key zoom and cleanupLars Greiss2016-11-021-0/+7
| | | | | | | | | - cleanup unused code - cleanup codestyle - add more zoom steps for smother zooming - show zoom circle indicator during zoom Change-Id: I5214fc2620a0c5167bfdc8e85f7115966c3b8bcf
* Camera: fix preview for landscape devicesPawit Pornkitprasan2016-11-021-3/+1
| | | | | | | | | | Landscape devices have broken preview because PORTRAIT mode is being abused to check for screen rotation. Use proper rotation check to fix. Ported from cm-10.2 Change-Id: I75588cbce9843e180e4be7591f6a43bcec788506
* SnapdragonCamera: Preview button should not work in secure modeJing (Mia) Wang2016-10-041-9/+11
| | | | | | | | | When camera is in secure mode, it will still listen to the preview event although the circle is invisible to the user. So disable the event listener of preview button. Change-Id: Ic4f1dbf32163a7f210e3f4b87599699f44e8f7b0 CRs-Fixed: 1002685
* SnapdragonCamera:Fix Face circles are drawn at an offsetjunjiez2016-09-131-3/+0
| | | | | | | | | | The layoutParam of FaceView is not the same as prview surface, and cause the offset.Remove setting layoutParam in the method onStartFaceDetection() and calculate the screen ratio in the VideoModule to get the correct layoutParam for FaceView Change-Id: I9bc2759bcb50514c183628e9d4f31d2f54437dc7 CRs-Fixed: 1064295
* SnapdragonCamera: Fix for false Selfie mirror previewJack Yoo2016-09-011-1/+1
| | | | | | | Preview for capture intent was applying mirror incorrectly. Change-Id: I9c81a8aecf5f28a968bb38214c5c94ec5d1e9021 CRs-Fixed: 1056065
* Merge "SnapdragonCamera: Fix camera preview stretched" into ↵Linux Build Service Account2016-08-181-0/+1
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix camera preview stretchedjunjiez2016-08-021-0/+1
| | | | | | | | | | | | | | | | | | Layout() method can't be triggered and caused stretched preview when the module is changed, so requestlayout the parent of preview to request layout. Change-Id: Ibb721fc36cd4ef2d3a0623ae0ba7fec468a8b377 CRs-Fixed: 1045131
* | Merge "SnapdragonCamera: Fix circles not drawn first time switch to ↵Linux Build Service Account2016-08-181-0/+3
|\ \ | | | | | | | | | camcoder" into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix circles not drawn first time switch to camcoderjunjiez2016-07-291-0/+3
| |/ | | | | | | | | | | | | | | | | OnDraw method can't be triggered by invalidate(), so set LayoutParams of the faceview to request a layout, and then OnDraw method will work when invalidate() is called. Change-Id: I7407700befad925e73ca8ce9eaa01fc7d3de1ab0 CRs-Fixed: 1043599
* | Merge "SnapdragonCamera: Fix face circle disappears for few frames" into ↵Linux Build Service Account2016-08-181-1/+4
|\ \ | |/ |/| | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix face circle disappears for few framesjunjiez2016-07-291-1/+4
| | | | | | | | | | | | | | | | | | When auto focus is moving, Faceview.clear() will be called and the face circle will disappear, so if the information of faces is still existed,we don't call Faceview.clear(). Change-Id: I67be2627b493edcbc329146eb816a15bddecab23 CRs-Fixed: 1040876
* | Merge "SnapdragonCamera: Remove custom location permission request window" ↵Linux Build Service Account2016-07-251-42/+0
|\ \ | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Remove custom location permission request windowJay Wang2016-07-191-42/+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: Force removing preview coverJay Wang2016-07-181-0/+9
|/ | | | | | | | A workaround to remove preview cover after picture is taken, if preview cover is not removed right after preview started. Change-Id: I723d70fde6ecaf7302714daa6648c85d8a40d1b4 CRs-Fixed: 1016691
* SnapdragonCamera: Fix the crash caused by Ubifocus help menuJay Wang2016-06-241-9/+5
| | | | | | | | | In some cases, the Ubifocus UI operation is called from camera thread and caused the exception. To resolve the issue, make sure UI operation is done only in UI thread. Change-Id: I07ef3392577169ecd642bf98a6c39de3580e963d CRs-Fixed: 1032532
* Merge "SnapdragonCamera: Fixed NPE during camera resume" into ↵Linux Build Service Account2016-06-101-1/+3
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fixed NPE during camera resumeJay Wang2016-06-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | There is a race condition that mMenu is not initialized before UI thread accessing the object. This can happen if the initialization of UI thread is completed before camera thread opens the camera device. Since the camera mMenu instance is created in the callback of onCameraOpened(), UI thread needs to check if mMenu is initialized or not before accessing it. Change-Id: Ic8ffc50b7334714de9a57b22f8229bc0ce868901 CRs-Fixed: 1013999
* | SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-311-2/+1
|/ | | | | | | | | | | 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
* Merge "SnapdragonCamera: Fix for layout stretching issue." into ↵Linux Build Service Account2016-05-171-1/+3
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix for layout stretching issue.Jack Yoo2016-04-281-1/+3
| | | | | | | | | | | | | | | | | | There's a device that layoutChangeListener is called later than layoutPreview is called. In this case, it fails to adjust the ratio. Adding checking routine for that. Change-Id: I717cd0ae1827f72eb15b7365001979d8fc4a66a8 CRs-Fixed: 1009374
* | Merge "SnapdragonCamera: Add null check before accessing mMenuHelp" into ↵Linux Build Service Account2016-05-171-2/+4
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Add null check before accessing mMenuHelpJay Wang2016-04-291-2/+4
| |/ | | | | | | | | | | | | | | | | There is a corner case that onClick was triggered right after mMenuHelp is released. Therefore, add the null check and just ignore the onClick callback. Change-Id: Ibff54edfe9976f8355243a740b98a844f85711b0 CRs-Fixed: 1009970
* | Merge "SnapdragonCamera: Support rotation for image review layout" into ↵Linux Build Service Account2016-05-171-0/+4
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Support rotation for image review layoutJay Wang2016-05-041-0/+4
| |/ | | | | | | | | | | | | | | | | | | Currently, image review layout is fixed to portrait mode. Changing the resources to use RotateImageView and update the scaling function in RotateImageView to support both up and down scaling of the image CRs-Fixed: 1004669 Change-Id: I6940227c634b7654bce5de5efe032aaa8da80e72
* / SnapdragonCamera: Fix NPE in touch handling eventJay Wang2016-05-041-1/+4
|/ | | | | | | | | There is a chance that preview menu layout is removed when the touch event happens. Validate the pointer before passing the event to the preview menu layout. CRs-Fixed: 1008189 Change-Id: Ie29d48276e93b52720ddb7230ec50303e77e9176
* SnapdragonCamera: Removing unnecessary orientation checkJack Yoo2016-04-181-15/+0
| | | | | | | | | Removing unnecessary code of checking the orientation. Swapping width and height causes redundant shrinking resulting to the wrong size calculation. Change-Id: I64badc2bd3198e409fe5673198e864d5025364e9 CRs-Fixed: 979254
* Merge "SnapdragonCamera: Adjusting view initialization" into ↵Linux Build Service Account2016-04-171-20/+16
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Adjusting view initializationJack Yoo2016-04-061-20/+16
| | | | | | | | | | | | | | | | Instead of removing and adding the entire root view, changing only core surface view on module change. Change-Id: I5c39cf23b2a58280f4e4e8484865bbed0b12e1cf CRs-Fixed: 979254
* | Merge changes I2139274e,I1d18d936 into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-04-171-3/+1
|\ \ | | | | | | | | | | | | | | | * changes: SnapdragonCamera: Fix occasional touch AF/AEC detection failure. SnapdragonCamera: Hide remaining photo counter
| * | SnapdragonCamera: Fix occasional touch AF/AEC detection failure.Jay Wang2016-04-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix the issue that during pause/resume, the preview region was not set properly and focus manager ignore bottom part of preview region. 2. On device with sensitive touch screen, single tap can be detected as scroll gesture. Make change to consider scroll gesture as single tap gesture if it is not the left swipe gesture. Change-Id: I2139274e60799eac866b8bb70ea66144548b5845 CRs-Fixed: 997843
| * | SnapdragonCamera: Hide remaining photo counterJay Wang2016-04-011-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Since the application that issues image capturing intent can specify own photo storage location, it doesn't make sense for SnapdragonCamera application showing the remaining photo counter based on its storage location. Therefore, make change to hide remaining photo counter when photo capturing requests is from an intent. Change-Id: I1d18d9365db8d4dc0060bc09b32e45a9370706b4 CRs-Fixed: 994963
* | SnapdragonCamera: hide the preview surface during suspendJay Wang2016-04-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Occasionally, the previous preview frame is presented and caused the screen flashing, when continuously triggering suspend/resume. To resolve the issue, hide the preview surface during suspend and make it visible during resume. This helps to clear the remaining preview frames in the buffer. CRs-Fixed: 991416 Change-Id: I96fff0fdae6bd14263f33b1a9032604596cf49c1
* | SnapdragonCamera: Camera2 add zoom supportByunghun Jeon2016-03-301-0/+5
|/ | | | | | | Add zoom support to Camera2 CRs-Fixed: 989750 Change-Id: Id6b558ff5215f04ca7c201b1d1807521d615c353
* SnapdragonCamera: Add Camera2 modeByunghun Jeon2016-03-301-1/+1
| | | | | | | Use camera2 API to show preview and take snapshot CRs-Fixed: 989750 Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
* SnapdragonCamera: Reset menu when device is rotatedByunghun Jeon2016-03-181-2/+6
| | | | | | | Reset the settings menu when the device is rotated Change-Id: I6c4fed7207a4d26a9d7c29d18f6a7af17ef3d4f9 CRs-Fixed: 981504
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 06:23:34 +0000