diff options
author | Shwetha Kotekar <skotekar@codeaurora.org> | 2015-03-10 13:36:06 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-07-30 05:03:50 -0700 |
commit | 2fc004c8bbbd21a873141d3710adcd5e2a9ad69a (patch) | |
tree | 7ba2c3a38e003d54bb721a120aa9886f3a9d3d6d /res/values | |
parent | 6d7dfbf65ebb420bc9c6ab37a2c9d97db870f5d4 (diff) | |
download | android_packages_apps_Snap-2fc004c8bbbd21a873141d3710adcd5e2a9ad69a.tar.gz android_packages_apps_Snap-2fc004c8bbbd21a873141d3710adcd5e2a9ad69a.tar.bz2 android_packages_apps_Snap-2fc004c8bbbd21a873141d3710adcd5e2a9ad69a.zip |
SnapdragonCamera: Disable CDS and TNR if SeeMore is enabled
If seeMore is enabled, send a disable command to HAL
to disable the CDS and TNR features.
Change-Id: I91bac0a01c58cb13ba32296739b47f74dc296003
SnapdragonCamera: Enable SeeMore option for 4k.
Currently SeeMore option for 4k recording is disabled.
As per requirements, enabling the same.
Change-Id: I69e84e0c20c199d80fc819f8aa6be62605bfbd79
SnapdragonCamera: Turning off CDS and TNR while SeeMore is on.
Ensuring turning off of CDS and TNR while see more feature is on.
Change-Id: I74c76f8b07046b8dca9db2be162b7ef20ba2d96d
CRs-Fixed: 937242
Camera2: Add StillMore option in Camera app menu
Add menu item for StillMore feature under the Advanced
Features item during camera preview.
Change-Id: I89ae260339896878ff4f1c5099885c6f3b05a18b
SnapdragonCamera: Changes to enable TNR processing by default.
TNR was disabled by default from UI. Change configures TNR
for camera stream to improve image quality. CDS is disabled
as TNR is enabled by default from now.
Change-Id: I7c1bf9533c52b8642fb15f79625cec57cc85b6cf
Crs-fixed: 890243
SnapdragonCamera: Checking whether SeeMore is available
Checking if the preference is available.
Change-Id: Ie885b9312f2fe054e272d15b9a38e2cedf756632
CRs-Fixed: 957117
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/qcomarrays.xml | 2 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 12 | ||||
-rw-r--r-- | res/values/strings.xml | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 6ae192645..2b565fd56 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -691,6 +691,7 @@ <item>@string/pref_camera_advanced_feature_entry_FSSR</item> <item>@string/pref_camera_advanced_feature_entry_trueportrait</item> <item>@string/pref_camera_advanced_feature_entry_multi_touch_focus</item> + <item>@string/pref_camera_advanced_feature_entry_stillmore</item> </string-array> <string-array name="pref_camera_advanced_features_entryvalues" translatable="false"> @@ -702,6 +703,7 @@ <item>FSSR-on</item> <item>true-portrait-on</item> <item>multi-touch-focus-on</item> + <item>@string/pref_camera_advanced_feature_value_stillmore_on</item> </string-array> <!-- Continuous shot --> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 723bdffc8..fcf08914d 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -128,6 +128,11 @@ <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string> <string name="pref_camera_manual_focus_entry_off">Off</string> + <!-- Still More --> + <string name="pref_camera_advanced_feature_entry_stillmore">Still More</string> + <string name="pref_camera_advanced_feature_value_stillmore_on">still-more-on</string> + <string name="pref_camera_advanced_feature_value_stillmore_off">still-more-off</string> + <!-- Video HDR--> <string name="pref_camera_video_hdr_title">Video HDR</string> <string name="pref_camera_video_hdr_default" translatable="false">off</string> @@ -140,7 +145,7 @@ <!-- Video CDS--> <string name="pref_camera_video_cds_title">Video CDS mode</string> - <string name="pref_camera_video_cds_default" translatable="false">on</string> + <string name="pref_camera_video_cds_default" translatable="false">off</string> <string name="pref_camera_video_cds_entry_auto">Auto</string> @@ -150,7 +155,7 @@ <!-- Video TNR --> <string name="pref_camera_video_tnr_title">Video TNR mode</string> - <string name="pref_camera_video_tnr_default" translatable="false">off</string> + <string name="pref_camera_video_tnr_default" translatable="false">on</string> <!-- Face detection --> <string name="pref_camera_facedetection_title">Face detection</string> @@ -516,8 +521,5 @@ <string name="pref_camera_manual_exp_value_exptime_priority" translatable="false">exp-time-priority</string> <string name="pref_camera_manual_exp_value_user_setting" translatable="false">user-setting</string> - <string name="pref_camera_see_more_value_off" translatable="false">off</string> - <string name="pref_camera_see_more_value_on" translatable="false">on</string> - <string name="pref_camera_dis_value_disable" translatable="false">disable</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index fecad0815..409bca714 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -379,6 +379,12 @@ <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] --> <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string> + <!-- Toast after SeeMore has been enabled to show CDS is disabled --> + <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string> + + <!-- Toast after SeeMore has been enabled to show TNR is disabled --> + <string name="disable_TNR_during_SeeMore">SeeMore will disable TNR.</string> + <!-- Exposure settings in preference --> <string name="pref_exposure_title">Exposure</string> <string name="pref_exposure_default" translatable="false">0</string> |