summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
Commit message (Collapse)AuthorAgeFilesLines
* Drop new focus indicator into Camera2.Paul Rohde2019-11-091-83/+10
| | | | | | | * 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-33/+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
* Snap: Materializejrizzoli2019-10-251-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* disable settings during recordingzhuw2019-05-171-5/+4
| | | | | | | don't allow entering settings during recording CRs-Fixed:2425070 Change-Id: I8783ba16448173a1f0f01f5ae44d66aa6d68698c
* SnapdragonCamera: Remove scene mode and deepportraitxianming wang2019-04-101-43/+7
| | | | | | | Remove scene mode only keep HDR mode, and remove deepportrait. CRs-Fixed: 2432037 Change-Id: I3f062dcc952f918dd51ee7fdfeefc8bf9c8d1c0f
* fix recording time dismiss issuezhuw2018-12-261-1/+1
| | | | | | | init textview with text "00:00" instead of "" Change-Id: I97ba2b9c39a4b30c00b67653c2cfa02dbfbf5c33 CRs-Fixed:2371276
* SnapdragonCamera: Fix mSoundPool is NULL and load resource slowlyxianming wang2018-12-141-1/+5
| | | | | | | | Init the SouldPool when the mCountDownView is not NULL and the SoundPool is NULL. CRs-Fixed: 2360653 Change-Id: I913bbd0c8b190a2a73d0d0123ffa8753d4ec9f91
* SnapdraongCamera:Fix flash button visibilityjunjiez2018-11-131-1/+6
| | | | | | | | Reinit the flash button after CountDown to set right visibility state. Change-Id: I3f96fbe19d1cbdbdd075f487d25d0bfed2d24630 CRs-Fixed: 2344673
* SnapdragonCamera: Fix no sound at 2s in "Countdown timer"xianming wang2018-11-071-1/+10
| | | | | | | | Move the SoundPool.load method more ahead play method for load the sound completed so that the sound can play. CRs-Fixed: 2338189 Change-Id: If4282aea8c081c54f40e1d8a5e091f412c7e3e53
* SnapdragonCamera: Don`t capture in high speed sessionxianming wang2018-10-191-0/+4
| | | | | | | Add judge conditions does not capture in high speed session. CRs-Fixed: 2331298 Change-Id: Icfe632aca58806735c2c7e5f8f8cfd12c8973efa
* SnapdragonCamera: Added checkbox stats visualizerjunjiez2018-09-261-0/+32
| | | | | | | 1) Added checkbox in stats visualizer 2) Added AWB information for display Change-Id: Id51d29b798a5d1f849463d28e03b695384fd3aa4
* Merge "remove flash icon in promode" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2018-09-241-2/+5
|\
| * remove flash icon in promodejinwu2018-09-211-2/+5
| | | | | | | | | | | | | | | | flash is not supported in promode now, so remove flash icon Change-Id: Ib91c1dfd1fd5313d93a5e88c56823aeefb3fc31a CRs-Fixed:2290558
* | Disable beauty if no jni filejinwu2018-09-211-1/+4
|/ | | | | | | disable makeup icon if no jni_makeupV2.cpp Change-Id: Iaf92e5749b39173706b770080ecb0d048390102b CRs-Fixed: 2305148
* SnapdragonCamera:Fix CTS issuejunjiez2018-06-281-1/+1
| | | | | | | | | Change the id of the review done button to match the requirement of CTS test Change-Id: I93859d78fa64a7fe9baad72019932e99833fb268 CRs-Fixed: 2226102
* SnapdragonCamera:Fix Dp toastjunjiez2018-06-061-2/+2
| | | | | | | | | | remove GLSurface when DP is off. when GLsurface is created, but DeepPortraitFilter is not in frame filter, don't show toast. Change-Id: I122d925e1564b0fcd75cd7797bf3f75085ecb2e7 CRs-Fixed: 2228152
* SnapdragonCamera: Set mDeepZoomModeRect gone in surfaceDestroyedxianming wang2018-05-011-0/+3
| | | | | | | | (1) Set mDeepZoomModeRect gone when surfacedestroyed is called. (2) Disable mVideoButton in DeepPortrait mode. CRs-Fixed: 2230047 Change-Id: Ifad2dd6052cd783451251c82307ef24241ea94c6
* SnapdragonCamera:Fix Dp iconjunjiez2018-03-291-0/+1
| | | | | | | | | Set deepportrait icon to visable after video recording is done, rotate icon when screen rotates. Change-Id: I843df6a9ce95022ef98cf301054905882e4a570c CRs-Fixed: 2212513
* SnapdragonCamera:Fix manual focusjunjiez2018-03-251-0/+4
| | | | | | | | | set the AF mode when turn on and turn off manual focus, don't unlock focus when capture in manual focus mode. Change-Id: I007c9235c67248ba6850e95bc3ab267703a70f06 CRs-Fixed: 2208004
* Fix FD offset when back from recording in zoom conditionzhuw2018-03-211-2/+3
| | | | | | reset camera bound when back Change-Id: Ia9527ad698e2a272c677f46d409f2e2095ed02b3
* Fix indicator still show when CAF focusedzhuw2018-03-211-2/+10
| | | | | | conflict with FD indicator's showing and dismissing Change-Id: Ib674ac3569f4378dd104581185b4bd1b84e63675
* Fix FD ROI mismatch issuezhuw2018-03-081-0/+1
| | | | | | change the mapping progress Change-Id: I8a9c57a50adcaebf6b5ffdcabad1d058262b2e7a
* SnapdragonCamera:DeepPortraitjunjiez2018-03-061-3/+115
| | | | | | Add deepportrait feature in SnapdragonCamera. Change-Id: I5fd223cacfb2526efffbf3f13f7c33cafd8ac99d
* Fix redundant ROI when enable FDzhuw2018-03-041-1/+5
| | | | | | remove redundant ROI after TAF Change-Id: Ic50470c7593816cd3b3d698d6534448f1123328d
* SnapdragonCamera: Complete the function of DeepZoomxianming wang2018-02-061-3/+63
| | | | | | | | Complete the function of DeepZoom, only support the 32 bit library. Does`t support the 64 bit library. CRs-Fixed: 2116533 Change-Id: I9c181ff0de005493d345ecc0b0380dda9910ce63
* SnapdragonCamera: Fix CAF in Manual Promodezhuw2017-12-271-0/+4
| | | | | | | don't CAF when in manual promode Change-Id: I3e0507588e229db74aa5d0f8afc74d30caace870 CRs-Fixed: 2160211
* SnapdragonCamera: Reset audioMute when mute in the recordingxianming wang2017-12-091-9/+11
| | | | | | | | When mute in the recording, and exit camera, reset the unmute value, so that does not affect the sound recorder. CRs-Fixed: 2153745 Change-Id: I3d8413dce714d3bc09f219ac4d10f605f5481f0d
* SnapdragonCamera:support multi camera switchjunjiez2017-11-171-0/+1
| | | | | | | add a new option in dev options to swtich camera by camera Id. Change-Id: Ieeb6f462024c3b155dc5fb532fd737313b9904de
* SnapdragonCamera: refactor captureStillPictureWeijie Wang2017-09-041-14/+10
| | | | | | | | 1. Split captureStillPicture into multiple smaller methods 2. Add some logs 3. Delete hack code Change-Id: I0ebc9625be880539f7c0c1d68350c093616205ad
* Revert "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"Weijie Wang2017-09-021-10/+14
| | | | | | This reverts commit b5533d51a7c97138235d29b35cec876d107aeadd. Change-Id: I8063422680802e25d03a374be91e884a86ad55e9
* SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3Weijie Wang2017-08-301-14/+10
| | | | | | Sync LA.UM.6.4 to LA.UM.6.3 Change-Id: Ide9a53b3b5ea6d17154003e4059ae3125f9f3346
* Revert "SnapdragonCamera: Changes for SDM bringup"Jay Wang2017-07-071-3/+1
| | | | | | This reverts commit f245124ed851a0888dbced9b887d0db2f0135177. Change-Id: I4c9d787c5486c822a764f7b2551a87c2f924fbcd
* SnapdragonCamera: Changes for SDM bringupJack Yoo2017-06-131-1/+3
| | | | | | | | | | | | | | | | Changes to accomodate the SDM bringup 0. Image flow change to be compatible to early version of CAMX 1. Pseudo ZSL mode to capture as configuring requires to be done all at the same time. 2. Video recording starts from the beginning as well for same reason. 3. Adding Cameracharacteristc availability check as meta is not all available yet. 4. Adding persist to selectively enable 4K Video recording in which case snapshot is disabled. The default is 1080P. Change-Id: Ib808dd2fe25398c444b220d40693a0436e4f6db5
* SnapdragonCamera: Smile/blink/gaze detectionjunjiez2017-03-141-2/+5
| | | | | | | | Implement Smile/blink/gaze detection feature and add option to enable it in develop options. CRs-Fixed: 1087487 Change-Id: I3005ca9767fbe38323e86255238cd4f96f34fbe5
* Merge "SnapdragonCamera:Fix Camera display a wrong label after recording ↵Linux Build Service Account2017-03-061-1/+2
|\ | | | | | | video." into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix Camera display a wrong label after recording video.pezhan2017-02-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | After recording video,the scene mode will use the last label. If switch to automatic mode,the scene mode label does't display, But if don't refresh label, next time after recording video ,will display last label in automatic mode. Need to refresh scene mode label when exit recording video mode. Change-Id: I87c0a8a0e64b6c622e0cfb658f164f8a59a20c4b CRs-Fixed: 2011981
* | SnapdragonCamera: fix filter menu showed in reviewjunjiez2017-02-201-0/+6
|/ | | | | | | | | | When camera is called by 3rd-party app and color filter menu is showed, the menu will not be closed after capture and preview is showed,add a judgement to close it. Change-Id: I79e254721a56abf190ce979fb84b62c08128498a CRs-Fixed: 2008844
* Merge "SnapdragonCamera:Fix Camera crash when taking picture with flash ↵Linux Build Service Account2017-02-161-8/+16
|\ | | | | | | light on." into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix Camera crash when taking picture with flash light on.pezhan2017-01-231-8/+16
| | | | | | | | | | | | | | | | | | | | If the CaptureModule is noraml mode ,the layout will not be inflated.If use it without check it's null, will cause force crash. Need to check if it's not the mormal mode,can use it safely. Change-Id: I4a8f1ddeaaf473e2fb99b418051bd54d6ebb9131 CRs-Fixed: 1114432
* | Merge "SnapdragonCamera:Fix The mode still on the viewfinder when taking a ↵Linux Build Service Account2017-02-161-0/+2
|\| | | | | | | video." into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix The mode still on the viewfinder when taking a video.pezhan2017-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | By default, the icon of mode is always display. When enter video mode,set the icon INVISIBLE ,when exit video mode,set it VISIBLE. Change-Id: Ifc8c8fb5f8e508387c553a15c57bdd93749038bb CRs-Fixed: 1109272
* | SnapdragonCamera:Fix photo reversed when enable selfie Mirrormingwax2017-01-191-1/+1
| | | | | | | | | | | | | | | | | | When camera is open front camer, and is in horizontal screen mode enable Selfie Mirror, set the image rotation angle of 180 degrees, to ensure the picture is right direction. CRs-Fixed: 1112749 Change-Id: I9b53804b7897f174c537693ff59db96df858e71d
* | Merge "SnapdragonCamera:Fix [FR35432] BestPicture function lost." into ↵Camera Software Integration2017-01-171-1/+14
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix [FR35432] BestPicture function lost.pezhan2017-01-111-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dialog when saving selected BestPicture. Add "X" icon display beside camcorder icon to exit BestPicture mode. Add multiple selections(Three dots beside SAVE)and "X" icon. Add dialog when select "X" icon. Add overflow menu with multiple selections to chose "Save All" or "Delete All" when click overflow menu. Add click for "Save All" to save all 1o pictures. Add click for "Delete All" to pop delete all dialog. Change-Id: I59cdad0f77fde616ea34db4d9d186d322285e394 CRs-Fixed: 1102814, 1102807, 1099428
* | SnapdragonCamera: Fix preview in wrong sizejunjiez2017-01-091-1/+4
|/ | | | | | | | | After setPreviewSize() is called, the size of the preview is not changed, need to invoke showSurfaceView to make it update. Change-Id: I67215bcce77c1016a0dfd66d100dcd251597af78 CRs-Fixed: 1105422
* SnapdragonCamera: add features for 3rd-party appsjunjiez2016-12-271-6/+153
| | | | | | | Add capture and recording features for 3rd-party app. Change-Id: Iefedbed2cb17cca17941e70f861448a2b8f97da2 CRs-Fixed: 1095457
* Merge "SnapdragonCamera: Dialog display incompletely in landscape mode" into ↵Camera Software Integration2016-12-221-7/+8
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Dialog display incompletely in landscape modeweijiew2016-12-151-7/+8
| | | | | | | | | | | | | | Create a new layout for landscape mode CRs-Fixed: 1099373 Change-Id: Ie505c6ef8795e0b8a8b3424afde7cb46fc368136
* | Merge "SnapdragonCamera: The "x" of the scene mark is too large" into ↵Camera Software Integration2016-12-201-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: The "x" of the scene mark is too largeweijiew2016-12-141-1/+1
| |/ | | | | | | | | | | | | Change the "x" of the scene mark to a small size. CRs-Fixed: 1101206 Change-Id: I7f64cd2b68ba30881309e7e5cb3a013e9168661a