summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
Commit message (Collapse)AuthorAgeFilesLines
* Snap: Add support for focus distanceSteve Kondik2019-11-091-1/+0
| | | | | | * Hook up available metadata to the new focus manager. Change-Id: I793df67a2682d8bb2dee994193111227dd8c8d5a
* Drop new focus indicator into Camera2.Paul Rohde2019-11-091-60/+7
| | | | | | | * 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: Remove "help screen on first start" featureArne Coucheron2019-10-251-31/+0
| | | | | | | | | | | | | | | | | | | | Revert "SnapdragonCamera: Add help menu to camera2" This reverts commit 0dbfdffc9994a17e60c57b17c3cc5743cc75e155. Change-Id: Icb4e4bbc2b7883fa232483615a18d3197b2577bd Revert "SnapdragonCamera: Move help menu string to ressource" This reverts commit 901130273dbfc753ef883941a4e93b50056177e4. Change-Id: I82815ee7ef80985c88315c40d6b222f688fd6b75 Revert "SnapdragonCamera: Adding help screen on first start" This reverts commit 666692bf730a1c46210cc74781a56afb4b6fcf28. Change-Id: I8f2ee58c263537c3a02248aa344516f5321de13f
* De-uglify menu.Danny Baumann2019-10-251-2/+3
| | | | Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761
* Remove unused menu indicators code.Danny Baumann2019-10-251-42/+0
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* Snap: Materializejrizzoli2019-10-251-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Thu Jan 7 21:07:51 2016 +0100 Snap: initial materialization Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it> Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Mon Jan 11 21:02:08 2016 +0100 Snap: remove captureUI pngdrawables CM now supports 90/270 degrees rotated vectordrawables Change-Id: I13b36463c60430564c00bd1e36393fff7ddbfdae Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it> Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Wed Jan 20 20:54:10 2016 +0100 Snap: update shutter button style Change-Id: Ide5fc0ff1c54e216ac7cd9bea202002d1d4dfa12 Author: Joey Rizzoli <joey@cyanogenmoditalia.it> Date: Sun Dec 11 21:30:18 2016 +0100 Snap: update caf icons Change-Id: I1adaf709253637bde037b5aea1f856fc5b9029c7 Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it> Author: Arne Coucheron <arco68@gmail.com> Date: Thu Aug 17 01:19:05 2017 +0200 Snap: Update HDR icons Current ones are so small, I can hardly see them. These new ones are bigger and looks more in line with the rest of the icons. Change-Id: Idaeec67a78d66105a375f09b6701a49dce43fd22 Author: codeworkx <daniel.hillenbrand@codeworkx.de> Date: Sat Jan 20 12:46:31 2018 +0100 Snap: update shutter buttons on CaptureUI Change-Id: I674de05dfb46fb714979ac66c16a85825af13c95 Author: Paul Keith <javelinanddart@gmail.com> Date: Tue Jan 23 23:36:19 2018 +0100 Snap: Update pano and video icons to be more like photo icons * Put the colored ring on the _outside_ of the shutter * While we're at it, cleanup naming and usage of color resources Change-Id: I4f344fa272374d043f2b83dba7248e263fab8bf0 Author: Andreas Blaesius <andi@unlegacy-android.org> Date: Fri Jun 1 17:47:00 2018 +0200 Snap: remove unused shutter buttons Change-Id: Id913626bbccc6fd245ed9f46374389ca7eca3c30 Change-Id: I7596f3c887874b4913d87ecbfa5438191fc86249 Signed-off-by: Chippa-a <vusal1372@gmail.com>
* Add orientation correction for landscape devicesandralex82019-10-251-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 modeNikita2019-10-251-2/+7
| | | | | | 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 enabledSultanxda2019-10-251-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>
* Camera: Change volume hard key button to zoom functionSu Liu2019-10-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Su Liu <suliu@codeaurora.org> Date: Wed Sep 4 18:16:50 2013 +0800 Camera: Change volume hard key button to zoom function Able to capture image through volume hard key button in camera application, change the function to zoom function. Change-Id: Iab9fc2492b2e2ff89cd58c21bac2f147f47b77e2 Author: jt1134 <jt1134@gmail.com> Date: Sat Jan 4 20:52:27 2014 -0600 Camera2: implement volume key zoom in video mode Change-Id: I140e8cfb3e39700f60e40c35b38e92c83a3c26de Author: Lars Greiss <kufikugel@googlemail.com> Date: Sun Feb 2 03:09:22 2014 +0100 Camera2: tweak volume key zoom and cleanup - cleanup unused code - cleanup codestyle - add more zoom steps for smother zooming - show zoom circle indicator during zoom Change-Id: I5214fc2620a0c5167bfdc8e85f7115966c3b8bcf Change-Id: I99dd2fffc92985156eece67c19435a71d14cd928
* Camera: fix preview for landscape devicesPawit Pornkitprasan2019-10-251-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
* 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
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 16:39:08 +0000