summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
Commit message (Collapse)AuthorAgeFilesLines
* snap: Use reveal animation when switching modesSteve Kondik2017-01-041-2/+2
| | | | Change-Id: I7a4b4fe2c29426b57020e3a5102d89b62d46c241
* snap: UX improvements v1Steve Kondik2017-01-041-72/+29
| | | | | | | | | | | | | * Make the camera controls do sane things- get rid of the manual placement of every widget and use layouts * Animate everything correctly * Show ripples when clicking the shutter * Clean up a metric ton of dead code * Moved more code into BaseUI * Make setting up the camera controls less verbose and magical * Fixed up panorama layout Change-Id: Iaed44ca0201a2e2641e1c2460d3ff9ec3eae2d85
* snap: Fixes for advanced features and scene modesSteve Kondik2017-01-041-4/+3
| | | | | | | | * Get rid of the annoying toast when longshot is disabled * Add support for ChromaFlash as a scene mode * Adjust overrides for various scene modes Change-Id: Ifda1990f4e9b3435655664f2a6c2b31fc3ae23fa
* Snap: Extend user menu, disable dev menucodeworkx2017-01-041-15/+27
| | | | Change-Id: Iaa64372e5d196fd0117a32a386686bdb1fd51e45
* De-uglify menu.Danny Baumann2017-01-041-14/+7
| | | | Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761
* Avoid static member variable.Danny Baumann2017-01-041-1/+0
| | | | Change-Id: I3758bb219552d22768afa0af83c69c6a5460693b
* Drop new focus indicator into Camera2.Paul Rohde2017-01-041-2/+2
| | | | | | | * 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: Fix NPE when switching flash modesmyfluxi2017-01-041-3/+5
| | | | | | If device does not support AE bracketing. Change-Id: I6ec89518addbc786a01291e9f7dd3be3d83cb588
* Snap: add support for shutter speedcodeworkx2017-01-041-0/+2
| | | | Change-Id: Id3393280c7c1c2f292d71587ba099e8dbafd1340
* Snap: Add touch-to-focus timeout duration settingsjt11342017-01-041-0/+2
| | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065
* Camera2: Add option to set max screen brightnessMichael Bestas2017-01-041-1/+3
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera: Powerkey shutter (2/2)Michael Bestas2017-01-041-0/+3
| | | | | | | | | | | | | | Ported from cm-10.1 Including cm-10.1 camera commit: aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization. Includes http://review.cyanogenmod.org/56986 [mikeioannina]: Updates for L Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
* Merge "SnapdragonCamera: set flash off when stillmore is on" into ↵Linux Build Service Account2016-08-181-0/+6
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: set flash off when stillmore is onjunjiez2016-08-041-0/+6
| | | | | | | | | | | | | | If stillmore is on, set flash to off Change-Id: Ieab39f4916d07be8cda5179a15c1d0f3af2472bb CRs-Fixed: 1046143
* | SnapdragonCamera: Shutter sound menuJack Yoo2016-08-161-1/+3
| | | | | | | | | | | | | | Shutter sound menu to choose on/off Change-Id: Id5ea22a837cd658c3278160a21c74b519f1bc212 CRs-Fixed: 1050663
* | SnapdragonCamera: Selfie Mirror modeJack Yoo2016-08-161-1/+3
|/ | | | | | | Selfie mirror menu for front camera1. Change-Id: I2e6845c9e25481106f51772b5d3dfd0a971a2be7 CRs-Fixed: 1050663
* Merge "SnapdragonCamera: Fix the issue Color effect is confusion" into ↵Camera Software Integration2016-08-021-2/+5
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix the issue Color effect is confusionweijiew2016-07-271-2/+5
| | | | | | | | | | | | | | | | | | Color effect display highlighting when scene mode set with non auto after switch rear/front camera.Set color effect display grey when scene mode set with non auto Change-Id: I2837de78ba0271a6b3acd25ca02aed9a63967328 CRs-Fixed: 1042257
* | Merge "SnapdragonCamera: Disable chroma flash when HDR is enabled" into ↵Camera Software Integration2016-08-021-0/+13
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Disable chroma flash when HDR is enabledjunjiez2016-07-211-0/+13
| |/ | | | | | | | | | | | | | | | | Camera HAL doesn't support to take picture with both HDR and chroma flash, so disable chroma flash when HDR is enabled to avoid crash Change-Id: I57a68d9b7371a75faceacf0fe1c3958dc21dae8b CRs-Fixed: 1013368
* / SnapdragonCamera: Remove custom location permission request windowJay Wang2016-07-191-0/+4
|/ | | | | | | | 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: Fix the issue that camera control is removedJay Wang2016-07-061-4/+7
| | | | | | | | Fix the issue that camera control menu is removed after HDR icon is clicked from camera control menu. Change-Id: I6e7c1a81fa356d0fa6cb5eb336ef844266a1bbf0 CRs-Fixed: 1038311
* 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