summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix up layout of auto HDR notice and histogram view.Danny Baumann2016-01-201-0/+12
| | | | Change-Id: I61f93c68b52d81c5e19919a5b0b894cf51dd35c4
* Remove unused menu indicators code.Danny Baumann2016-01-201-43/+0
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* Avoid static member variable.Danny Baumann2016-01-201-1/+5
| | | | Change-Id: I3758bb219552d22768afa0af83c69c6a5460693b
* SnapdragonCamera: Fix UI alignment glitches when nav-bar is enabledSultanxda2016-01-201-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-01-151-56/+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
* SnapdragonCamera: Hide all camera setting when countdown timer startslikaid2016-01-141-0/+12
| | | | | | | | | | | | Camera setting including module switcher scene mode filter mode and front/back camera switcher should not be used during countdown timer, since it may cause unexpected concurrent errors. Hide all the camera settings when countdown timer starts, show them again after countdown. Change-Id: I79c2add63c61d304fe0948e1c9fefe3a8c1a6fee CRs-Fixed: 900086
* SnapdragonCamera: Hide camera controllers when review captured imagelikaid2016-01-111-0/+2
| | | | | | | | | | | | The camera settings options including scene mode, color effect, switcher for back/front camera, and the beautification make-up should only be shown on camera preview, since they are not used for editing pictures. Hide these camera setting options to avoid making user confused. Change-Id: I26599c4d97043069eee9c1a069325735ba625a94 CRs-Fixed: 895938
* Snap: initial materializationjrizzoli2016-01-091-16/+1
| | | | | | | Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
* SnapdragonCamera: notify focus manager about surface changeLikai Ding2016-01-081-0/+4
| | | | | | | | | | If device and preview have different aspect ratio, preview doesn't occupy full screen. So SurfaceView's dimensions including margins need to be considered for transformation matrix. Otherwise touch focus area set to HAL won't match with actual user touch point on screen. Change-Id: I6b7bfa6e3cb831592615dc5dfc45622f106c99d0
* PhotoUI: Calling layoutPreview on holdersize become validJack Yoo2016-01-081-1/+3
| | | | | | | Need to ensure calling layoutPreview on max size change Change-Id: I8c49397c85c592879c38585ff66d1d24bde72d86 CRs-Fixed: 927240
* SnapdragonCamera: Make camcorder switcher icon invisible.likaid2016-01-081-0/+1
| | | | | | | | | | | When take photo for contact and back from setting ,the camcorder switcher icon will show. When take photo from contact,then set the camcoder switcher icon invisible. Change-Id: If0153650d131c5b1ee78a79c255c637aab410d8e CRs-Fixed: 884351
* Snap: Remove CAF beautification featureMichael Bestas2015-09-201-29/+2
| | | | | | | | | | | | Revert "SnapdragonCamera: Move the files to the correct location" This reverts commit c25b2d510285512dbb60547353190433f1dbb984. Revert "SnapdragonCamera: Add beautification feature to SnapdragonCamera." This reverts commit c1cea7c15b2e463f37c17f2a4ce61ce689ec7088. Change-Id: If01e4f438a58e4210a3eddf090d426895ecbae87
* Camera2: tweak volume key zoom and cleanupLars Greiss2015-09-171-11/+1
| | | | | | | | | - cleanup unused code - cleanup codestyle - add more zoom steps for smother zooming - show zoom circle indicator during zoom Change-Id: I5214fc2620a0c5167bfdc8e85f7115966c3b8bcf
* Camera: Change volume hard key button to zoom functionSu Liu2015-09-171-0/+17
| | | | | | | | Able to capture image through volume hard key button in camera application, change the function to zoom function. Change-Id: Iab9fc2492b2e2ff89cd58c21bac2f147f47b77e2
* Camera: fix preview for landscape devicesPawit Pornkitprasan2015-09-171-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
* Merge fa458f0a64a6b4412912c9177ec0fbeed084a28f on remote branchLinux Build Service Account2015-08-061-65/+71
|\ | | | | | | Change-Id: Ib0ecc314a7bd0b76c8e955402d9adfe0a4989223
| * SnapdragonCamera: remove nav bar to enable full screen previewByunghun Jeon2015-08-031-65/+71
| | | | | | | | | | | | | | Remove the navigation bar in order to take advantage of full screen. Change-Id: I25f42af825c4f3b7ad6521c2ee6d62fa4219044a CRs-Fixed: 865254
* | SnapdragonCamera: Fix Zoom orientationByunghun Jeon2015-06-241-0/+3
|/ | | | | | Fix Zoom UI's orientation Change-Id: I9c14b08729e099c263d612289ccb8b7ed757168b
* SnapdragonCamera: Popup menu doesn't support RTL modelikaid2015-04-111-2/+5
| | | | | | | | | Coordinate direction is opposite in RTL mode. Modify Coordinate direction in RTL mode. Change-Id: I3fcd42fc27d430b486f9cccdde5ecec0d0468d30 CRs-Fixed: 819310
* Merge "SnapdragonCamera: Fix capture picture not to store"Linux Build Service Account2015-04-021-1/+2
|\
| * SnapdragonCamera: Fix capture picture not to storelikaid2015-03-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | When enter gallery quickly after taking snap,the onPictureTaken in framework will not response which cause the picture can not be saved and make this bug happen. When judge the camera state is in the snap progress,not enter to gallery so that the picture can be saved. Change-Id: I79f74cdaf4c90ad71eb3f9b10a46027939fbffa7 CRs-Fixed: 811686
* | SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-231-2/+29
|/ | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* Merge "SnapdragonCamera: Fix settings menu layout dirction from right to ↵Linux Build Service Account2015-03-131-7/+19
|\ | | | | | | left in RTL mode."
| * SnapdragonCamera: Fix settings menu layout dirction fromlikaid2015-03-061-7/+19
| | | | | | | | | | | | | | | | | | right to left in RTL mode. Use gravity of RIGHT instead of LEFT in RTL mode. Change-Id: I879fd0351c447b35a5dac7fe14e1698b08883583 CRs-Fixed: 801704
* | SnapdragonCamera: Draw the mouth position according to the orientationlikaid2015-03-101-0/+3
|/ | | | | | | | | | The mouth position on FaceView wasn't right in landscape mode because the orientation didn't change when rotated device. Re-correct the position of mouth when the device orientation changed. Change-Id: I81115bda8636e24484f2bda55415ebc0fa0a1f9a CRs-Fixed: 792980
* Snapdragon: Fix photo/video preview to match with captured photo/videoByunghun Jeon2015-02-201-1/+1
| | | | | | | | Photo and video preview and the captured results are different for some resolutions. Fix them to match the result. Change-Id: Ie5fb1954448fa54ffb968f2882e74bfd98c97548 CRs-Fixed: 791082
* SnapdragonCamera: circular thumbnail iconLikai Ding2015-02-171-27/+5
| | | | | | | | | | 1. change thumbnail icon to circular and its background to transparent 2. speed up loading with optimal sample size and region decoder 3. fix orientation bug regarding panorama photos 4. don't fire load task on fake onDataLoaded() call Change-Id: I7f4eb8dad4c54a01a7ccd98907e06952e470840b (cherry picked from commit ac714ea974b4bd0ef99403def5aa7d8a3deecc5d)
* Merge "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Linux Build Service Account2015-02-101-1/+1
|\
| * SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | Changed the Panoramic preview to full screen Resized the warped preview image to smaller Size and render on top of the full screen preview image Warped preview image can be turned on/off Change-Id: I859839542ce94c5f70d7fe7983e93b5e9534b415
* | Merge "SnapdragonCamera: Cover the preview until the preview really starts"Linux Build Service Account2015-02-101-4/+7
|\ \
| * | SnapdragonCamera: Cover the preview until the preview really startslikaid2015-02-051-4/+7
| |/ | | | | | | | | | | | | | | | | | | When the surface was ready, the preview data may not come yet, that caused the desktop ui flashed in the camera when relaunching camera. Delay the occasion of dismissing preview cover until onPreviewStarted. Change-Id: I80b751bd19889683d784b94827b668efa817ff02 CRs-Fixed: 789076
* / SnapdragonCamera: fix preview not shown bugLikai Ding2015-02-061-0/+2
|/ | | | | | | | resizeForPreviewAspectRatio() might be called before SurfaceView's layout process, which causes SurfaceView being set to 0 width and height. Add check before adjusting SurfaceView's dimensions. Change-Id: I66bf6dfcef74253429b2c6cd1a80031d8e30f95d
* SnapdragonCamera: fix portrait orientationLikai Ding2015-02-021-16/+68
| | | | | | | | | | | | Fix camera activity to portrait, so there is no delay when rotation occurs. Main changes are: 1. RotateLayout now supports padding and dynamically added child. 2. Camera controls and gesture detetion are now orientation-aware. 3. Toasts are replaced with RotateTextToast. 4. Obselete layout files are removed. Change-Id: I338849bd7fb84b847eb357f771a24a5cc09bf6fa
* SnapdragonCamera: Sync surface destruction and camera open thread.Sai Kumar Sanagavarapu2015-01-201-1/+1
| | | | | | | | | | If surface gets destroyed while Camera open thread is still trying to start preview, camera app state machine will go into toss. Next time when surface gets created again, it might try to set preview surface again while previewing leading to app exception. So, sync surface destruction and camera open threads. Change-Id: I6ba4103559766c327d2bc55887a0f7df1b4b0d40
* Merge "SnapdragonCamera: implement refocus feature"Linux Build Service Account2015-01-181-0/+5
|\
| * SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-0/+5
| | | | | | | | | | | | | | | | Add a scene mode for refocus. If the latest photo is taken with refocus, user can click on the preview thumbnail, then refocus it by tapping on the photo. Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
* | SnapdragonCamera: Fix null pointer exception in SnapdragonCamerakaiyiz2015-01-151-3/+8
|/ | | | | | | | | | Null Pointer exception occurred in Camera during monkey test. Add null pointer check before use them. Change-Id: I992f6b8f8dc6b91947ec3e4d703b4e9b72996f67 CRs-Fixed: 780252
* SnapdragonCamera: support 4:3 preview on 16:9 screenLikai Ding2015-01-081-44/+95
| | | | | | | | When preview is set to 4:3 on a 16:9 screen, resize SurfaceView to 4:3 and cover other parts of the screen. Otherwise camera controls have a semi-transparent background. Change-Id: Icfbe6318b6a9de9a988468078b474e842f6ddd8c
* Merge "SnapdragonCamera: fix app crash when switch to camcorder"Linux Build Service Account2015-01-071-0/+9
|\
| * SnapdragonCamera: fix app crash when switch to camcorderkaiyiz2014-12-161-0/+9
| | | | | | | | | | | | | | | | | | | | Camera app crash when switch to camcorder during continuously shooting. Prohibition click event when continuously shooting. CRs-Fixed: 744811 Change-Id: Ia51ca53d46e060c2a4f4e877c37f795526532be7
* | SnapdragonCamera: show how many more pictures can be takenLikai Ding2014-12-221-0/+3
|/ | | | | | | Prompt to user an estimation of how many more pictures can be taken, calculated based on available storage. Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
* SnapdragonCamera: Add back missing setting menusByunghun Jeon2014-11-191-30/+25
| | | | | | Adding back missing setting menus Change-Id: I803d3f694b1953aa6a8932cbba6bb55c0d0e6352
* SnapdragonCamera: Add preview thumbnail buttonByunghun Jeon2014-11-191-2/+22
| | | | | | Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
* SnapdragonCamera: Use MDP composition instead of GPUByunghun Jeon2014-11-171-63/+92
| | | | | | Use MDP composition instead of GPU Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-12/+175
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Merge "Camera2: fix camera carsh when mPieRender is null"Linux Build Service Account2014-11-021-3/+6
|\
| * Camera2: fix camera carsh when mPieRender is nullkaiyiz2014-10-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | The autofocus maybe called before onCameraOpened, and mPieRender is not initialize which lead to camera crash. Check null when show focus ui. CRs-Fixed: 712850 Change-Id: If3d51c8ea31f4a755e26fe4730e85428373e6446
* | Merge "Camera2: fix sawtooth in camera preview"Linux Build Service Account2014-11-021-8/+4
|\ \
| * | Camera2: fix sawtooth in camera previewLikai Ding2014-10-151-8/+4
| |/ | | | | | | | | | | | | | | | | | | Under certain combination of preview/screen resolution, sawtooth is seen on preview image. In setTransformMatrix(), scaledTextureWidth/Height is unnecessarily rounded to integers, losing precision. Removing the rounding fixes the problem. CRs-Fixed: 705322 Change-Id: Ia78b012cf530528b3677a8684279862a81b145ed
* / Camera: open Camera and start Preview in a seperate thread.Sai Kumar Sanagavarapu2014-10-201-4/+6
|/ | | | | | | | Start openCamera and start preview in a separate thread so that UI initialization and preview can run parallely. This is to improve camera cold start latency. Change-Id: I57af45bc90a4db1630c73449d543c3ff0992e55c