summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
* Camera: Disable HDR when scene mode is other than autoSanthosh Kumar Thimmanna Bhattar2014-04-291-0/+10
| | | | | | | | | | | - HDR option is enabled even when scene mode is not auto. Due to this preview and snapshot are still remain in previous scene mode after enabling HDR. - Fix is to disable the HDR when scene mode is other than auto Change-Id: I6f75f3c686d79757c464deaeca495de767bdabb0 CRs-Fixed: 648847
* Merge "Camera2: dismiss all popups during camera exiting"Linux Build Service Account2014-04-211-2/+2
|\
| * Camera2: dismiss all popups during camera exitingGaoxiang Chen2014-04-141-2/+2
| | | | | | | | | | | | | | | | If home key is pressed when UI is showing second level popup menu, it should dismiss all popup menu, instead of back to top level menu. Change-Id: I4678ebf875833e577d610c0aba856da5eaade982 CRs-fixed: 622519
* | Merge "Camera2: add UI option to on/off longshot"Linux Build Service Account2014-04-211-1/+2
|\ \
| * | Camera2: add UI option to on/off longshotFei Zhang2014-04-141-1/+2
| | | | | | | | | | | | | | | | | | Add a menu option to turn on/off longshot. Change-Id: I21b5b8e8181317dc2db5ece44a60be66a52f5d0a
* | | Merge "Camera2: fix the picture format not update problem"Linux Build Service Account2014-04-191-1/+1
|\ \ \
| * | | Camera2: fix the picture format not update problemKerong Sui2014-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we set the ZSL on, the picture format should change to Jpeg immediately. So we override the setting menu. Change-Id: Ie24acf61667a7faa7603d8c3876bcba0ec0da5c2 CRs-fixed: 621806
* | | | Camera2: Disable HDR if Advanced features are enabledIvan Evlogiev2014-04-161-0/+2
| |/ / |/| | | | | | | | | | | | | | - Preference also need to be set to off. Menu disable is not enough Change-Id: Ib0a6103021941f370efa68ee6aef058aa7e6106c
* | | Merge "Camera2: Gray out UI options when Opti zoom feature is selected"Linux Build Service Account2014-04-101-1/+1
|\ \ \
| * | | Camera2: Gray out UI options when Opti zoom feature is selectedIvan Evlogiev2014-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Same UI options need to be grayed out when Opti zoom feature is selected, as chroma flash and ubi focus Change-Id: I31fc76476ce4ad88cbfbf4f61c40db2b5047d144
* | | | Merge "Camera2: Disable AOST for non zsl"Linux Build Service Account2014-04-101-18/+31
|\| | | | |/ / |/| |
| * | Camera2: Disable AOST for non zslIvan Evlogiev2014-04-011-18/+31
| | | | | | | | | | | | | | | | | | - Disable AOST features for non zsl Change-Id: I064f8e1be8a85576c5e4e9baa8ee29a2b40bd14e
* | | Merge "Revert "Camera2: Fix HDR and ZSL conflict""Linux Build Service Account2014-04-031-4/+0
|\ \ \ | |/ / |/| |
| * | Revert "Camera2: Fix HDR and ZSL conflict"Evgeniy Borisov2014-03-281-4/+0
| | | | | | | | | | | | | | | | | | This reverts commit 84a338105bcf799ed66c0b6341b15b30acb1dae7. Change-Id: Ie90da9ec28bd780fe701fb966b0912f8e5d121af
* | | Camera2: Override camera settings for advanced camera featuresIvan Evlogiev2014-04-011-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When any of advanced camera features are enabled: - scene mode needs to be auto - ae bracketing needs to be disabled - red eye reduction needs to be disabled - flash needs to be off - focus mode need to be infinity - touch ae/af need to be disabled - exposure compensation need to be 0 - color effect need to be none Change-Id: I2520d13b7b40452a93a133aaf416eb16072613a4 CRs-fixed: 625657
* | | Camera2: override UI options when scene mode is enabledRajaram Gudivada2014-04-011-0/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | When HDR or any other scene mode is enabled, following UI options are turned to grey saturation contrast sharpness coloreffect CRs-Fixed: 627382 Change-Id: Ie4550bc7d2342d703062519815a5bb03bfbb496b
* | Camera2: Disable some conflict items when HDR onliangche2014-03-271-0/+3
|/ | | | | | | | | When HDR on, some conflict items need disable. The change through call onSharedPreferenceChanged to update the UI, which can let these items invisible when HDR on. Crs-fixed: 630787 Change-Id: Ia27b6c816cdf406a00984370c26482b2d6d00791
* Camera2: Fix HDR and ZSL conflictliangche2014-03-061-0/+4
| | | | | | | | Camera will crash when capture in zsl and hdr mode sametime, fix this issue through enabling one mode will disable the other one. CRs-fixed: 622514 Change-Id: I6a898809a174996f62269a56f2769505042aefee
* Camera: Add a feature to choose where to store the picture and videoSanthosh Kumar H E2014-02-271-1/+2
| | | | | | | | | | | | Add a feature to choose use SDcard or phone to store picture and video captured by camera and camcorder. Some of the changes are taken from: I987a691c93edc4250fe0366d0623c85ea0152117 CRs-Fixed: 619806 Change-Id: I009df4c70f0a1b49b20750f806c799f025bb6197
* Camera2: Enable HDR for zsl modeEvgeniy Borisov2014-01-081-4/+0
| | | | | | HDR is now supported for zsl mode Change-Id: Ic9985e9f2ca6ffea3f33aef1f6f2949d4876c8d9
* Merge "Camera: Add support for UbiFocus, ChromaFlash and OptiZoom."Linux Build Service Account2013-12-201-0/+1
|\
| * Camera: Add support for UbiFocus, ChromaFlash and OptiZoom.Ajit Singh Solanki2013-12-131-0/+1
| | | | | | | | | | | | | | | | | | - Add UI option in App to enable/disable UbiFocus, ChromaFlash and OptiZoom - App shows UI options for these features only when supported in HAL Change-Id: I924f97b2b510b351d9a8cb48a0aac6a4dc24ca10
* | Camera: Overrides the focus mode for ZSLEmilian Peev2013-12-131-2/+7
|/ | | | | | | | | | | | | - This modification will override the currently configured focus mode to CAF( if supported ) in case we switch to ZSL mode. In addition to that the client will not be able to change the focus mode once ZSL is active. - TouchAF will be available in ZSL mode if supported. - Moves focus option to the rest of the 3A modes. Change-Id: I4a2ab7d6013c26365cf46e7b3c5d2d0d3afd574e CRs-fixed: 522500,528835,585670
* Remove duplicate settings.Santhosh Kumar H E2013-11-211-68/+0
| | | | | | | | | | | | | Some of the settings options are repeated because they were added along with new features and base camera application also has those settings. So removed duplicate settings as per the requirement. Base camera settings are removed to maintain uniformity with other settings added and its as per the expectation of internal test team also. Change-Id: Ic609540e9e372ad3bef0e634012821b3cb1a12c5 CRs-Fixed: 569673, 575211
* Camera2: Fix compilation issuesManish Kumar2013-10-311-1/+52
| | | | | | | | Fix compilation issues Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21 (cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4) (cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
* Camera: Fix for stretched preview in camera and camcorder...Santhosh Kumar H E2013-10-311-20/+21
| | | | | | | | | | | | | | | | | | | | Stretched preview is observed in front camera due to sensor's mount angle. So resizing the preview by considering aspect ratio of the preview. (cherry picked from commit Ie8a9e062782aa6caaa80ddab705c937da6b0761e) Change-Id: I0bca9076a6dffa4c4972e6d5d0939c57569615bd Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java (cherry picked from commit 2960ef94825458dc07a497d4414155b57ae620d7) (cherry picked from commit d2fbed622a486151a656261d0dd56c896f0cc700)
* Camera : Fix null preference string for scene mode and fd.Sai Kumar Sanagavarapu2013-10-311-4/+4
| | | | | | | | | | Null pointer exception in app is observed when the preference string for scene mode is dereferenced.for YUV Sensor, preference setting for scene mode is NULL as its not applicable for YUV sensor. Change-Id: Icc04e9b21641b1cc3ca7e183a23667be151b5a65 (cherry picked from commit 56dd2afdd7ad89e85d06450175538dbd3f075e8c) (cherry picked from commit 040389fdf54389745b19a61f40732f54a8ce7344)
* Camera: Gray out unsupported options when scene mode is not set to AutoAlok Kediya2013-10-311-0/+17
| | | | | | | | | | | | | When scene mode is set to a value other than Auto, camera application is querying for the focus, autoExposure, flash, white balance, exposure values. Framework is returning the values which user had set irrespective of whether they are supported or not. And also there was no check during the initalization of the settings dialogs. This change will enable the above settings only if scene mode is set to auto. Change-Id: I1e4e84c405c5d163ac352854d3a847bba63831c9 (cherry picked from commit 4cbc5da11bd9e378c5e82d31688aa0e8917ae483) (cherry picked from commit b07c51a67b576bc564a8073ca0f7f5d5e2ee7ef8)
* Camera: Some of the options in the Camera settings are getting selected only ↵Alok Kediya2013-10-311-11/+21
| | | | | | | | | | | | | when we tap on it twice We are maintaining the popup dialog level in a variable and based on that top level popup is dismissed and the previous popup will be displayed. (cherrypicked from commit 6b8a6e50b48432572ce80ca753b3fe1bab87191a) Change-Id: I6876c5663047eb0d3ec1ce64af6182be0b5bd79c (cherry picked from commit f147ea11ff0b993f8aa5e335065c88051341ab8d) (cherry picked from commit 591973b04ca5444bc644e1ad1f02ea0b5b237d86)
* Camera: Fix issue with dialog box in camera settingsAlok Kediya2013-10-311-3/+1
| | | | | | | | | | | | Dialog box is not getting closed even after clicking on "done" button in camera and camcorder settings. This change fixes this issue. (cherrypicked from commit b9f6f18ba263bb36a0bf03cfafb8b91a659cb2e5) Change-Id: Icf5afbb399e5abf93d19a9112200d507355662e6 (cherry picked from commit 2408d38f98dd692b972ec25d10a11bd0d6c15747) (cherry picked from commit e82ce8f4cb6ecd3e702087b4989832dd8a265601)
* Camera: Adds support for Face Recognition enableAlok Kediya2013-10-311-0/+1
| | | | | | | | | | | | | - This change enables the camera client to configure the face recognition feature depending on the camera support of the lower layers. (cherrypicked from commit 9d469e2a66859fe5070d9651a41d0ca330ccc8cb) Change-Id: I141632e27cbef3bb53ea06a249491eff78b5f13b (cherry picked from commit b420162dd9c1f974628e8e7ff83bc0909c59e272) (cherry picked from commit 9c258ff94e7ce18c7e4072b83203092bd3d4c0d1)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 18:56:29 +0000