diff options
author | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2014-10-01 20:44:47 +0530 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-07 20:22:01 -0800 |
commit | bf809d3a0e1039c95a186597a22c012db786709b (patch) | |
tree | 0d83758d9dad4ed2989fb57c95734498ca476b4f /res | |
parent | 25dee8bc2d2fc082e11649b3f226e0908dd92ad6 (diff) | |
download | android_packages_apps_Snap-bf809d3a0e1039c95a186597a22c012db786709b.tar.gz android_packages_apps_Snap-bf809d3a0e1039c95a186597a22c012db786709b.tar.bz2 android_packages_apps_Snap-bf809d3a0e1039c95a186597a22c012db786709b.zip |
SnapdragonCamera: Add support for manual 3A params.
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
Diffstat (limited to 'res')
-rw-r--r--[-rwxr-xr-x] | res/values/arrays.xml | 2 | ||||
-rw-r--r-- | res/values/qcomarrays.xml | 39 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 35 | ||||
-rw-r--r--[-rwxr-xr-x] | res/values/strings.xml | 2 | ||||
-rw-r--r-- | res/xml/camera_preferences.xml | 21 |
5 files changed, 97 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index d1baeaeb5..fce180df2 100755..100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -19,7 +19,7 @@ <!-- Camera Preferences Video Quality entries --> <string-array name="pref_video_quality_entries" translatable="false"> <item>@string/pref_video_quality_entry_4kdci</item> - <item>@string/pref_video_quality_entry_2160p</item> + <item>@string/pref_video_quality_entry_2160p</item> <item>@string/pref_video_quality_entry_1080p</item> <item>@string/pref_video_quality_entry_720p</item> <item>@string/pref_video_quality_entry_480p</item> diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 9b71634a2..0b1037e72 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -559,6 +559,45 @@ <item>@string/pref_camera_selectablezoneaf_value_frameaverage</item> </string-array> + + <string-array name="pref_camera_manual_exp_entries" translatable="false"> + <item>@string/pref_camera_manual_exp_entry_ISO_priority</item> + <item>@string/pref_camera_manual_exp_entry_exptime_priority</item> + <item>@string/pref_camera_manual_exp_entry_user_setting</item> + <item>@string/pref_camera_manual_exp_entry_off</item> + </string-array> + + <string-array name="pref_camera_manual_exp_entry_values" translatable="false"> + <item>@string/pref_camera_manual_exp_value_ISO_priority</item> + <item>@string/pref_camera_manual_exp_value_exptime_priority</item> + <item>@string/pref_camera_manual_exp_value_user_setting</item> + <item>@string/pref_camera_manual_exp_value_off</item> + </string-array> + + <string-array name="pref_camera_manual_wb_entries" translatable="false"> + <item>@string/pref_camera_manual_wb_entry_color_temperature</item> + <item>@string/pref_camera_manual_wb_entry_rbgb_gains</item> + <item>@string/pref_camera_manual_wb_entry_off</item> + </string-array> + + <string-array name="pref_camera_manual_wb_entry_values" translatable="false"> + <item>@string/pref_camera_manual_wb_value_color_temperature</item> + <item>@string/pref_camera_manual_wb_value_rbgb_gains</item> + <item>@string/pref_camera_manual_wb_value_off</item> + </string-array> + + <string-array name="pref_camera_manual_focus_entries" translatable="false"> + <item>@string/pref_camera_manual_focus_entry_scale_mode</item> + <item>@string/pref_camera_manual_focus_entry_diopter_mode</item> + <item>@string/pref_camera_manual_focus_entry_off</item> + </string-array> + + <string-array name="pref_camera_manual_focus_entry_values" translatable="false"> + <item>@string/pref_camera_manual_focus_value_scale_mode</item> + <item>@string/pref_camera_manual_focus_value_diopter_mode</item> + <item>@string/pref_camera_manual_focus_value_off</item> + </string-array> + <!-- ZSL dialog box entries --> <string-array name="pref_camera_zsl_entries" translatable="false"> <item>@string/pref_camera_zsl_entry_off</item> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 93a39003d..c72f9bb1e 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -166,6 +166,41 @@ <string name="pref_camera_advanced_feature_value_trueportrait_off">true-portrait-off</string> <string name="pref_camera_advanced_feature_value_multi_touch_focus_off">multi-touch-focus-off</string> + <!-- Manual exposure control entry values --> + <string name="pref_camera_manual_exp_title">Manual Exposure</string> + <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string> + <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string> + <string name="pref_camera_manual_exp_entry_user_setting">User setting</string> + <string name="pref_camera_manual_exp_entry_off">Off</string> + + <string name="pref_camera_manual_exp_default">off</string> + <string name="pref_camera_manual_exp_value_ISO_priority">iso-priority</string> + <string name="pref_camera_manual_exp_value_exptime_priority">exp-time-priority</string> + <string name="pref_camera_manual_exp_value_user_setting">user-setting</string> + <string name="pref_camera_manual_exp_value_off">off</string> + + <!-- Manual white balance entry values --> + <string name="pref_camera_manual_wb_title">Manual White balance</string> + <string name="pref_camera_manual_wb_entry_color_temperature">Color temperature</string> + <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string> + <string name="pref_camera_manual_wb_entry_off">Off</string> + + <string name="pref_camera_manual_wb_default">off</string> + <string name="pref_camera_manual_wb_value_color_temperature">color-temperature</string> + <string name="pref_camera_manual_wb_value_rbgb_gains">rbgb-gains</string> + <string name="pref_camera_manual_wb_value_off">off</string> + + <!-- Manual Focus entry values --> + <string name="pref_camera_manual_focus_title">Manual Focus</string> + <string name="pref_camera_manual_focus_entry_scale_mode">Scale mode</string> + <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string> + <string name="pref_camera_manual_focus_entry_off">Off</string> + + <string name="pref_camera_manual_focus_default">off</string> + <string name="pref_camera_manual_focus_value_scale_mode">scale-mode</string> + <string name="pref_camera_manual_focus_value_diopter_mode">diopter-mode</string> + <string name="pref_camera_manual_focus_value_off">off</string> + <!-- Settings screen, ZSL location dialog choices --> <string name="pref_camera_zsl_entry_off">Off</string> <string name="pref_camera_zsl_entry_on">On</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index d597e5af0..2d3aee027 100755..100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -244,7 +244,7 @@ Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_4kdci" translatable="false"> 4k DCI</string> - <!-- Video quality setting entry. + <!-- Video quality setting entry. Videos will be recorded in 4k UHD quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_2160p" translatable="false"> 4k UHD</string> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 4052b9634..39c54daa7 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -282,4 +282,25 @@ camera:title="@string/pref_camera_hdr_need_1x_title" camera:entries="@array/pref_camera_hdr_need_1x_entries" camera:entryValues="@array/pref_camera_hdr_need_1x_entryvalues" /> + + <ListPreference + camera:key="pref_camera_manual_exp_key" + camera:defaultValue="@string/pref_camera_manual_exp_default" + camera:title="@string/pref_camera_manual_exp_title" + camera:entries="@array/pref_camera_manual_exp_entries" + camera:entryValues="@array/pref_camera_manual_exp_entry_values" /> + + <ListPreference + camera:key="pref_camera_manual_wb_key" + camera:defaultValue="@string/pref_camera_manual_wb_default" + camera:title="@string/pref_camera_manual_wb_title" + camera:entries="@array/pref_camera_manual_wb_entries" + camera:entryValues="@array/pref_camera_manual_wb_entry_values" /> + + <ListPreference + camera:key="pref_camera_manual_focus_key" + camera:defaultValue="@string/pref_camera_manual_focus_default" + camera:title="@string/pref_camera_manual_focus_title" + camera:entries="@array/pref_camera_manual_focus_entries" + camera:entryValues="@array/pref_camera_manual_focus_entry_values" /> </PreferenceGroup> |