summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
Commit message (Collapse)AuthorAgeFilesLines
* De-uglify menu.Danny Baumann2018-01-261-2/+3
| | | | Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761
* Remove unused menu indicators code.Danny Baumann2018-01-261-42/+0
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* Snap: initial materializationjrizzoli2018-01-261-19/+1
| | | | | | | Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
* Add orientation correction for landscape devicesandralex82018-01-261-0/+4
| | | | | | | | | | | | | Snap does not correctly handle devices with a landscape screen as rotation is 0 when device is in landscape while Snap assume that 0 is portrait. This lead to a rotated gui and a deformed preview. This commit: - Solve the gui rotation for Photo, Video and Panorama modules - Solve the deformed preview for Photo and Video (Panorama preview was ok with gui fix) - Solve the PhotoMenu rotation (all devices, it was also broken on portrait devices) Change-Id: Ic0b95904da6e13946c7e46e2e571b26da498db02
* Snap: Fix incorrect preview layout surface size in landscape modeNikita2018-01-261-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
* SnapdragonCamera: Fix UI alignment glitches when nav-bar is enabledSultanxda2018-01-261-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>
* Camera2: tweak volume key zoom and cleanupLars Greiss2018-01-261-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 Liu2018-01-261-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 Pornkitprasan2018-01-261-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: Rename the resource Id to fix CTS issue.Santhosh Kumar Thimmanna Bhattar2018-01-091-1/+1
| | | | | | | | | | | | | Issue: CTS test case testImageCapture is failing due to mismatch in resource Id of OK button in SnapdragonCamera app and CTS . After take picture , CTS app is sending click event for OK button in SnapdragonCamera. But event is failed due to mismatch in Id. Fix: Rename resource Id of OK button as per the CTS. Change-Id: I7d3b087e4ac73fc7ee1034b7d2845241e6023b29
* SnapdragonCamera:Enable bokeh zoomjunjiez2017-10-181-3/+0
| | | | | | | | Enable zoom feature when it's in RTB bokeh mode. Change-Id: I8631c825ab403544d8e4c71051dba03b56d0bf92 CRs-Fixed:2114574
* SnapdragonCamera:RTB focus UIjunjiez2017-08-031-2/+16
| | | | | | | | | According to the spec, hide tips when bokeh succeeds, and show normal focus circle and tips when bokeh succeeds. Change-Id: Icefbc88d764b5db9f975baeef0f52fefadc4f08a CRs-Fixed: 2083336
* SnapdragonCamera:Disalbe options in RTBjunjiez2017-08-031-0/+3
| | | | | | | | Disable some options in the setting when it's in real time bokeh mode and modify the style of seekbar and bokeh text. Change-Id: If6f2fe40c3a405ac8a4451029d18e38d93305ef5
* SnapdragonCamera:Fix focus indicate issuejunjiez2017-07-281-0/+4
| | | | | | | | 1.hide face detection circle in real time bokeh 2.Delay hiding bokeh focus icon and seekbar when focus success. Change-Id: I2c02ec4a7eceda9b54f1241fe071701150b3adc3
* SnapdragonCamera:modify RTB UIjunjiez2017-07-261-3/+17
| | | | | | | | | | | | | | 1. reduce the size of the bokeh focus circle. 2. hide bokeh focus circle and seekbar when it's not needed. 3. update the location of the seekbar according the location of the bokeh focus circle 4. convert depth map buffer to rgb then compress to jpeg Change-Id: Ibfa4d1d90413939566129247a23325f941507691
* SnapdragonCamera:RTB UIjunjiez2017-07-261-0/+32
| | | | | | | | | | | | | | | 1.add a new icon on the top of camera control to enable bokeh mode. 2.add toast to show the distance,lighting and effect alert. 3.add debug mode to save all the images received from HAL separately 4.modify ui according to the spec Change-Id: I1178015f48c29cade4e14bb531c9727665905fec
* SnapdragonCamera: Fix mRemainingPhotos show error issuemingwax2017-06-141-0/+8
| | | | | | | | | When user select the high quality picture, hide the remainingPhoto. When user select the standard or low quality picture, show the remainingPhoto. CRs-Fixed: 2058878 Change-Id: I7924b71fa01b28b6ef7e07abfbc23a577c695d62
* Revert "SnapdragonCamera:Fix no recording thumbnail when capture during ↵junjiez2017-03-211-1/+3
| | | | | | | | recording." This reverts commit 0c38495f9f0aae023de5bdfb0ada2f846000278f. Change-Id: I113f5142fca4bc53163d5de9105fb865b34683b3
* Merge "SnapdragonCamera: Shutter button is overlap with Beauty menu" into ↵Camera Software Integration2017-03-091-0/+1
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Shutter button is overlap with Beauty menuweijiew2017-03-021-0/+1
| | | | | | | | | | | | | | Dismiss beauty menu when UI is on pause. Change-Id: If4d08fa8a9117fbab52bfb1688d4ef4d5898d17c CRs-Fixed: 2014017
* | SnapdragonCamera: fix thumbnail displayed in capture modejunjiez2017-02-281-1/+1
|/ | | | | | | | Make it don't setup ImageView of thumbnail and don't update thumbnail when it is in capture mode. Change-Id: Ide2afb1eb34010c914d9ba78aa324f5e1c0b7fb0 CRs-Fixed: 2007834
* SnapdragonCamera: Fix display error in showCapturedImageForReviewmingwax2016-12-271-0/+1
| | | | | | | When show CaptureImageForReview should be seted Orientation. CRs-Fixed: 1105427 Change-Id: Ia039ba2472a56fcb1b0aa534575dea9c805b98dc
* SnapdragonCamera: GPS location can't be turn On in camera settingsweijiew2016-11-241-1/+1
| | | | | | | | | In Camera2, SharedPreferences persistes GPS location value by key(pref_camera2_recordlocation_key), but gets GPS location value by key(pref_camera_recordlocation_key). CRs-Fixed: 1088262 Change-Id: I33ddeb8f20fed03449bded2760c0ad1b8e36c91c
* SnapdrgaonCamera: Putting TrackingFocus jni hookJack Yoo2016-09-271-1/+1
| | | | | | | | Adding tracking focus jni library loading part and touch event Change-Id: Ic570a09a0d93eb4b81e52334ba4a1bee2b67cb12 CRs-Fixed: 1067848
* Merge "SnapdragonCamera: Preview button should not work in secure mode" into ↵Linux Build Service Account2016-09-261-9/+11
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Preview button should not work in secure modeJing (Mia) Wang2016-09-121-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-141-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
* Merge changes I868c8584,I398ed793,I88c592f7,I9c81a8ae into ↵Linux Build Service Account2016-08-261-1/+1
|\ | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0 * changes: SnapdragonCamera: Changing icon size SnapdragonCamera: Mono preview visibility change on pause SnapdragonCamera: ShutterSound control to cover long shot SnapdragonCamera: Fix for false Selfie mirror preview
| * SnapdragonCamera: Fix for false Selfie mirror previewJack Yoo2016-08-181-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