diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-09-19 11:59:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-09-19 11:59:46 -0700 |
| commit | 81b91551dfd0f35380094e3434e5358e8d63f0ba (patch) | |
| tree | 3202b70814559f43b7c53427a718c296602075a4 /res | |
| parent | 0fa36eae91e743e85f2942407e6b686cb38ac363 (diff) | |
| parent | ec449be018e9ff0f644d3484e61334a9667f82a6 (diff) | |
| download | android_packages_apps_Snap-81b91551dfd0f35380094e3434e5358e8d63f0ba.tar.gz android_packages_apps_Snap-81b91551dfd0f35380094e3434e5358e8d63f0ba.tar.bz2 android_packages_apps_Snap-81b91551dfd0f35380094e3434e5358e8d63f0ba.zip | |
Merge "SnapdragonCamera: Add HDR need 1x menu selection"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/qcomarrays.xml | 11 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 20 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 7 |
3 files changed, 35 insertions, 3 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index f7d127993..39f177adf 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -620,5 +620,16 @@ <item>@string/pref_hdr_mode_value_multi_frame</item> </string-array> + <!-- Camera Preferences Selectable HDR need 1x frame --> + <string-array name="pref_camera_hdr_need_1x_entries" translatable="false"> + <item>@string/pref_camera_hdr_need_1x_entry_false</item> + <item>@string/pref_camera_hdr_need_1x_entry_true</item> + </string-array> + + <string-array name="pref_camera_hdr_need_1x_entryvalues" translatable="false"> + <item>@string/pref_hdr_need_1x_value_false</item> + <item>@string/pref_hdr_need_1x_value_true</item> + </string-array> + </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index c9bbaaadd..9c5865942 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -698,9 +698,23 @@ <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string> <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string> - <!-- HDR mode entry values. Do not translate. --> - <string name="pref_hdr_mode_value_sensor">hdr-mode-sensor</string> - <string name="pref_hdr_mode_value_multi_frame">hdr-mode-multiframe</string> + <!-- HDR mode entry values. Do not translate. --> + <string name="pref_hdr_mode_value_sensor">hdr-mode-sensor</string> + <string name="pref_hdr_mode_value_multi_frame">hdr-mode-multiframe</string> + + <!-- Settings screen, Selectable HDR need 1x frame default value --> + <string name="pref_camera_hdr_need_1x_default">true</string> + + <!-- Settings screen, Selectable HDR need 1x frame title --> + <string name="pref_camera_hdr_need_1x_title">HDR need 1x frame</string> + + <!-- Settings screen, Selectable HDR need 1x frame radio button choices --> + <string name="pref_camera_hdr_need_1x_entry_false">False</string> + <string name="pref_camera_hdr_need_1x_entry_true">True</string> + + <!-- HDR need 1x frame entry values. Do not translate. --> + <string name="pref_hdr_need_1x_value_false">false</string> + <string name="pref_hdr_need_1x_value_true">true</string> <!--Default video rotation setting--> <string name="pref_camera_video_rotation_default" translatable="false">0</string> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index ab1e340f8..d7f245343 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -263,4 +263,11 @@ camera:title="@string/pref_camera_hdr_mode_title" camera:entries="@array/pref_camera_hdr_mode_entries" camera:entryValues="@array/pref_camera_hdr_mode_entryvalues" /> + + <ListPreference + camera:key="pref_camera_hdr_need_1x_key" + camera:defaultValue="@string/pref_camera_hdr_need_1x_default" + 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" /> </PreferenceGroup> |