summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Add SettingsManager, scene, and filter" into ↵Camera Software Integration2016-06-071-11/+3
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-311-11/+3
| | | | | | | | | | | | | | | | | | | | | | 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
* | SnapdragonCamera: disable instant capture in some cases.Jay Wang2016-05-261-1/+3
|/ | | | | | | | | | | 1. Disable instant capture when ZSL is off or advanced features are enabled 2. Change the instant capture option to support the selection of aggressive AEC and fast AEC CRs-Fixed: 998509 Change-Id: I60f7ed3a0fc93627dbf7527fbec2a60605aad683
* Merge "SnapdragonCamera: Make switcher visible only when it was" into ↵Linux Build Service Account2016-04-171-1/+13
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Make switcher visible only when it wasJack Yoo2016-03-311-1/+13
| | | | | | | | | | | | | | | | Make switcher button be visible only when it was set to be visible in first place. Change-Id: Id0df702b990bbada02ac25eb6981c6bd5e4082b0 CRs-Fixed: 995902
* | SnapdragonCamera: Add Camera2 modeByunghun Jeon2016-03-301-2/+28
|/ | | | | | | Use camera2 API to show preview and take snapshot CRs-Fixed: 989750 Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
* SnapdragonCamera: Put off filter mode to none on scene modeJack Yoo2016-03-291-0/+1
| | | | | | | When scene mode is selected, turning off filter mode icon Change-Id: Ic31fb98ccf6b66a80e573f3bd6b1329ee86340ab CRs-Fixed: 991225
* SnapdragonCamera: Remove accessing to dialog stringsJay Wang2016-03-291-6/+4
| | | | | | | | | | Accessing to translatable strings can lead to unexpected behavior when non-English is selected as system language. Making change to remove any accessing to translatable strings. Change-Id: I687abdff984bf0e5680c34861fac8c1271b88ead CRs-Fixed: 993382
* SnapdragonCamera: Resolve camera control overlapping issueJay Wang2016-03-281-0/+4
| | | | | | | | | | Clicking beautification icon right after clicking camera switching icon can cause overlapping of camera controls and beautification controls. To resolve issue, hide the UI controls during camera switching. Change-Id: I5c4b96ce10c0d44e8c63c41207a4ec3d09312b51 CRs-Fixed: 977967
* SnapdragonCamera: Hiding optizoom and ubifocus on lowmemory deviceJack Yoo2016-03-221-4/+7
| | | | | | | Hiding optizoom and ubifocus scene mode menu on low memory device Change-Id: Ieb11f780e18479caca7ca788ca32fa949bd1a212 CRs-Fixed: 986681
* SnapdragonCamera: Add the developer option for instant captureJay Wang2016-03-181-0/+1
| | | | | | | | | | | | A developer option is added to support instant capture feature in the camera HAL. Once option is enabled, Snapdragon camera application will take a snapshot as soon as it is resumed from the lock screen by pressing power button twice. For this to work, user also needs to enable "Press power button twice for camera" under display setting. Change-Id: I84794759ee1edc9424c37b71bd0c2b761a77bee1 CRs-Fixed: 970691
* SnapdragonCamera: Fix menu highlight issue when rotating deviceByunghun Jeon2016-02-061-0/+1
| | | | | | | | Fix menu highlight issue when rotating device by resetting highlight after rotation. Change-Id: Ib2dea3801e04afa69e8d43369213bfc2f166e413 CRs-Fixed: 970646
* SnapdragonCamera: Fix the memory leak on view.Jack Yoo2016-01-301-11/+2
| | | | | | | | Keep using modules instead of creating. Don't remove the view without cleaning it. Change-Id: I260a660cac3d770f7d02dfdc1881e15490da66a0 CRs-Fixed: 958510
* SnapdragonCamera: Closing pie on auto focus change.Jack Yoo2016-01-301-1/+0
| | | | | | | | | Closing pie renderer on auto focus change in case of incomplete focus attempt. Move focusmode menu to developer option too Change-Id: I97faf95b640a8f4fedea8c5f2f8ca4ab020c8cca CRs-Fixed: 961396
* SnapdragonCamera: Fix the menu key name of filter mode.Jack Yoo2016-01-241-2/+2
| | | | | | | Correcting the key name of the filter mode menu. Change-Id: If52b31c55f62ffd5b65bc8336ec443cde0328101 CRs-Fixed: 951550
* SnapdragonCamera: Color Effect shows the current statusJack Yoo2016-01-241-3/+24
| | | | | | | Let the icon shows the current status of the color effect on/off Change-Id: I1c3719db15d4dd920b89591064cda372c7ab89be CRs-Fixed: 951550
* SnapdragonCamera: Disable HDR when AutoHDR is onCamera Software Integration2016-01-081-4/+26
| | | | | | | Hide HDR button when AutoHDR is on. Change-Id: Ic5482ae577c1991711c46d709af3108c1f0620b6 CRs-Fixed: 929738
* SnapdragonCamera: Implementing SelfieFlash featureCamera Software Integration2015-12-221-0/+2
| | | | | | | Introducing SelfieFlash feature. Change-Id: I7b73d9db585038640b715092b01e037538ef68aa CRs-Fixed: 937232
* Merge "SnapdragonCamera: Restore color effect when set scene mode."Linux Build Service Account2015-10-051-0/+7
|\
| * SnapdragonCamera: Restore color effect when set scene mode.likaid2015-09-251-0/+7
| | | | | | | | | | | | | | | | | | When set scene mode,there is no operation to color effect. When set scene mode, add operations to reset color effect. Change-Id: I05b7315f101e806a28424bd8a2d1f7038f27efc9 CRs-Fixed: 913811
* | Merge "SnapdragonCamera: Fix rtl photo menu touch issue"Linux Build Service Account2015-09-291-0/+5
|\ \
| * | SnapdragonCamera: Fix rtl photo menu touch issuelikaid2015-09-141-0/+5
| |/ | | | | | | | | | | | | | | The touch rect is not correctly checked on RTL mode. Recheck touch rect range on preview menu. Change-Id: I40e980377f1765c9caea397a3be085142dd006ce CRs-Fixed: 904563
* / SnapdragonCamera: Hide all camera setting when countdown timer startslikaid2015-09-141-0/+21
|/ | | | | | | | | | | | 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: Close setting/scene mode when setting is selectedByunghun Jeon2015-08-281-2/+2
| | | | | | | Close setting/scene mode when setting is selected Change-Id: I584b7eaea25774ec4906a40ddae2eda89646893e CRs-Fixed: 898871
* SnapdragonCamera: Hide the top menu items on captured previewlikaid2015-08-041-0/+14
| | | | | | | | | | | The menu items will make user confused if show them on the captured preview view. Hide them in that scene, show them again after restart camera preview. CRs-Fixed: 851505 Change-Id: I16df39645209621058a644e2da17e22010a7f451
* Merge "SnapDragan: Changes to enable UI option for ASD mode."Linux Build Service Account2015-05-301-0/+6
|\
| * SnapDragan: Changes to enable UI option for ASD mode.Guruprasad Gaonkar2015-05-121-0/+6
| | | | | | | | | | | | | | ASD menu was not available on latest snapdragon application. Changes provided to enable scene modes. Change-Id: If02e97c4912ade7463055c8fefc35d10009a7c9e
* | SnapdragonCamera: implement optizoom and chromaflash UILikai Ding2015-05-271-0/+13
|/ | | | | | add scene mode for optizoom and preference entry for chromaflash Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
* SnapdragonCamera: Enable the TNR option in camera modeTanmaya Godbole2015-04-161-1/+0
| | | | | | | | | | | The TNR option was previously greyed out in the menu for camera mode, so it was not possible to enable temporal denoise. Now, the TNR option is no longer greyed out, and users may enable or disable this feature as they wish. Change-Id: Id6c0f613982e954ecb1410f1290a10608cbfc675 CRs-Fixed: 791534
* SnapdragonCamera: Popup menu doesn't support RTL modelikaid2015-04-091-35/+85
| | | | | | | | | Coordinate direction is opposite in RTL mode. Modify Coordinate direction in RTL mode. Change-Id: I3fcd42fc27d430b486f9cccdde5ecec0d0468d30 CRs-Fixed: 819310
* SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-201-16/+193
| | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* Merge "SnapdragonCamera: Set Flash to be the first menu in settings"Linux Build Service Account2015-03-191-2/+2
|\
| * SnapdragonCamera: Set Flash to be the first menu in settingsByunghun Jeon2015-03-171-2/+2
| | | | | | | | Change-Id: Ia451a2fff983f3bfc850f066d7346d90d0a91dab
* | Snapdragon: Add HDR to scene mode menuByunghun Jeon2015-03-171-14/+29
|/ | | | | | Add HDR as a scene mode to scene mode menu Change-Id: I0d6d9c87d09e72dd24f6d1a2e26fab91f7cb700e
* Merge "SnapdragonCamera: Disable filter mode when HDR is on"Linux Build Service Account2015-02-091-15/+13
|\
| * SnapdragonCamera: Disable filter mode when HDR is onkaiyiz2015-01-231-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | When HDR was on, filter mode was invalid,it has no effect on preview, besides, scene mode had been changed to auto, but the scene icon didn't change. When HDR is ON, disable filter mode, and change scene mode icon to auto. Change-Id: I1e43021f0441b13549b6511a18252679299beec8 CRs-Fixed: 782599
* | SnapdragonCamera: fix portrait orientationLikai Ding2015-02-021-53/+69
|/ | | | | | | | | | | | 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
* Merge "SnapdragonCamera: implement refocus feature"Linux Build Service Account2015-01-181-0/+11
|\
| * SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-0/+11
| | | | | | | | | | | | | | | | 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-4/+10
|/ | | | | | | | | | Null Pointer exception occurred in Camera during monkey test. Add null pointer check before use them. Change-Id: I992f6b8f8dc6b91947ec3e4d703b4e9b72996f67 CRs-Fixed: 780252
* SnapdragonCamera: fix settings list can't disappear after resume camerakaiyiz2015-01-101-7/+10
| | | | | | | | | | | | | Normal the animateFadeOut will be called when activity paused, but if click sub menu just before pause activity, the animateFadeOut will be blocked by flag POPUP_IN_ANIMATION. Make animateFadeOut and animateSlideOut use different flags for judge whether need to start animation or not. Change-Id: I49a0cb8f70771ccdd292b589a266a5417f78c6ef CRs-Fixed: 778167
* SnapdragonCamera: Fix app crash when camera not support scenemodeJing (Mia) Wang2014-12-201-7/+7
| | | | | | | | | | | The front camera is not support set scenemode, the layout for show scenemode isn't initialize and NPE happened, which lead to app crash. The scene mode button shouldn't display when scene mode is not support. CRs-Fixed: 773391 Change-Id: I9c65fb5b65ecb276660b3281a5a591f7a3f2a134
* SnapdragonCamera: Add back missing setting menusByunghun Jeon2014-11-191-272/+875
| | | | | | Adding back missing setting menus Change-Id: I803d3f694b1953aa6a8932cbba6bb55c0d0e6352
* SnapdragonCamera: Add support for manual 3A params.Sai Kumar Sanagavarapu2014-11-071-1/+7
| | | | | | | | | | | | | | | | Add UI support to take inputs from user for the following 3A paramters 1. Manual focus : a. Scale mode 0-100 b. Diopter mode 0-10 2.White balance: a. CCT b. RGB gains 3. Exposure control a. ISO b. exposure time Change-Id: I92ea3719fa2224e02943bb2191987c7654aaf9ea
* Merge "Camera2: Add Multi-touch UI and control in apps."Linux Build Service Account2014-11-041-1/+4
|\
| * Camera2: Add Multi-touch UI and control in apps.Santhosh Kumar Thimmanna Bhattar2014-10-271-1/+4
| | | | | | | | | | | | Changes to support multi-touch focus feature in application Change-Id: I3dc0f3bf5cd71554856a00795e82d52f36066eeb
* | Merge "Camera2: Add FSSR in Advanced features menu."Linux Build Service Account2014-11-041-0/+3
|\|
| * Camera2: Add FSSR in Advanced features menu.Santhosh Kumar Thimmanna Bhattar2014-10-271-0/+3
| | | | | | | | | | | | | | 1.Add FSSR option in Advanced features menu. 2.Query supported FSSR modes and enable FSSR. Change-Id: I40b9c7875483d022a1561b17aeb90d2e4cb789ce
* | Merge "Camera2: Add TruePortrait in Advanced features menu."Linux Build Service Account2014-11-041-1/+4
|\|
| * Camera2: Add TruePortrait in Advanced features menu.Sai Kumar Sanagavarapu2014-10-271-1/+4
| | | | | | | | | | | | | | 1.Add TruePortrait option in Advanced features menu. 2.Query supported TruePortrait modes and enable TP. Change-Id: I3e9bd54ab8e495eabb591bd380cf0553715e938a