summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
* | Merge "SnapdragonCamera: Enable TNR only in Video mode"Linux Build Service Account2014-11-041-0/+1
|\ \ | |/ |/|
| * SnapdragonCamera: Enable TNR only in Video modeDimitar Borisov2014-10-291-0/+1
| | | | | | | | | | | | | | | | - TNR is enabled in Video mode only - KEY_QC_VIDEO_TNR_MODE is updated correctly CRs-Fixed: 739136 Change-Id: If2ed62f38199b4353ffaae6bab693de87f7634d8
* | Camera: open Camera and start Preview in a seperate thread.Sai Kumar Sanagavarapu2014-10-201-1/+2
|/ | | | | | | | Start openCamera and start preview in a separate thread so that UI initialization and preview can run parallely. This is to improve camera cold start latency. Change-Id: I57af45bc90a4db1630c73449d543c3ff0992e55c
* Camera2: Disable advance features when continuous shot mode is enabledSanthosh Kumar Thimmanna Bhattar2014-10-151-0/+23
| | | | | | | | | - Camera is getting stoppped in continuous shot mode when advance feature like ubifocus is enabled. - Fix is to disable advance features when continuous shot mode is enabled and vice versa Change-Id: Icc47dfd8a3d617b46794ae8abfd02e72b8e0b682
* SnapdragonCamera: Add support for CDS and TNR settingsDimitar Borisov2014-09-301-3/+41
| | | | | | | | | | | | | Add support for CDS and TNR settings - CDS and TNR can be controlled in photo mode and video mode. - CDS is set to off and cannot be set to other value when TNR is enabled - CDS value is restored when TNR is disabled again CRs-Fixed: 715042 Change-Id: Idf08403e38d0e3e634b047a955f2328b4237e691
* SnapdragonCamera: Add HDR need 1x menu selectionIvan Evlogiev2014-09-111-1/+2
| | | | | | - HDR need 1x can be true (default) or false Change-Id: I184ad034d61165becb9fb95a0963e8e8c0752558
* SnapdragonCamera: Add HDR mode menu selectionIvan Evlogiev2014-08-211-1/+2
| | | | | | - HDR mode can be sensor (default) or multi-frame Change-Id: I4513c52e9050d66e25d70ed8f484637dc75c6196
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-1/+1
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Merge "Camera2: fix more settings menu use the same icon"Linux Build Service Account2014-07-081-3/+3
|\
| * Camera2: fix more settings menu use the same iconkaiyiz2014-06-301-3/+3
| | | | | | | | | | | | | | | | | | | | There is only one icon fit this menu. Add new icons for this menu item and use them in videomenu and photomenu. CRs-Fixed: 634284 Change-Id: I277bd01910fd27508e50b5b1793e9e5f58e0c70f
* | Camera2: Add support to save Depth map for refocusIvan Evlogiev2014-06-301-0/+3
|/ | | | | | | Save the Depth map when callback by jpeg, which is bypass in jpeg encode. Change-Id: I9a4e64400b71f35d6fa6638cdfe08a6c40f0046b
* Merge "Camera2: Adding support for Auto HDR"Linux Build Service Account2014-06-141-2/+9
|\
| * Camera2: Adding support for Auto HDRAbhishek Pant2014-06-061-2/+9
| | | | | | | | | | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* | Merge "Camera2: Fix flash item status incorrect when turn on/off AE-Bracket"Linux Build Service Account2014-06-111-3/+0
|\ \
| * | Camera2: Fix flash item status incorrect when turn on/off AE-Bracketkaiyiz2014-06-061-3/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The popup should not be set null when the popup is showing, which will lead to the view(popup) could not be update by application. Example: when turn on/off AE-Bracket could not disable flash item after popup is set null Don't set popup null when the popup is showing. [Reference similar code in VideoMenu] CRs-Fixed: 674423 Change-Id: Id8c5772f3504014ee6591cc16dddcacbf5325629
* / Camera2: Still popup tips when change scene to other after turn off HDRkaiyiz2014-06-101-9/+11
|/ | | | | | | | | | | | | The toast popup or not depend on the value of hdr and scene mode, but now the value mHdrOn status is not uniform with the actual hdr value, which lead to popup toast incorrect. Get the value of scene mode or hdr from the preference directly rather than a new variable. So the mHdrOn is not used and delete it. CRs-Fixed: 674521 Change-Id: I1c6926e0ba295e9869109b7412a7413323d3bd1c
* Camera2: Query support for longshot and ZSL+HDR from parameters.Sai Kumar Sanagavarapu2014-06-021-1/+1
| | | | | | | | | | Query camera parameters to check if longshot and ZSL+HDR are supported or not. Also, add generic way of enabling/disabling preferences to facilitate features which are mutually exclusive. Change-Id: I4332e3d5050f56b1953e4c0d767eb87f7e932c49
* Camera2: disable ZSL setting during counting downLikai Ding2014-05-291-0/+1
| | | | | | | | During counting down, ZSL setting should not be changed by user. Add check in popup initialization as well. Change-Id: I02439aef78adaa190158452ea034fa19256f9d85 CRs-Fixed: 664691
* Camera: Disable flash for AE-BracketSuman Mukherjee2014-05-221-0/+11
| | | | | | | | | | | | The main flash is high, AE bracketing requires several frames. If the LED lit up at high for long, it could be burned and cause HW damge. Fix: Flash has been disabled if AE-Bracket option is enabled with proper toast message. CRs-Fixed: 663613 Change-Id: Ic568630783309af19f7670aee563cd6eb0032fb1