diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:48:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:48:42 -0700 |
| commit | 717d30db6542d59334b139e2460fa9c45aca5065 (patch) | |
| tree | be5e011b86f62452ea019b981c867644357aa249 /res | |
| parent | e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f (diff) | |
| parent | 0587d0eb74f9bf352370664fbfbe72b604cd18c1 (diff) | |
| download | android_packages_apps_Snap-717d30db6542d59334b139e2460fa9c45aca5065.tar.gz android_packages_apps_Snap-717d30db6542d59334b139e2460fa9c45aca5065.tar.bz2 android_packages_apps_Snap-717d30db6542d59334b139e2460fa9c45aca5065.zip | |
Merge "SnapdragonCamera: Add ISO and exposure" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/camera2arrays.xml | 14 | ||||
| -rw-r--r-- | res/xml/capture_preferences.xml | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 9865e3900..f4ac13e8c 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -507,7 +507,6 @@ <!-- Camera Preferences ISO dialog box entries --> <string-array name="pref_camera2_iso_entries"> <item>@string/pref_camera_iso_entry_auto</item> - <item>@string/pref_camera_iso_entry_isodeblur</item> <item>@string/pref_camera_iso_entry_iso100</item> <item>@string/pref_camera_iso_entry_iso200</item> <item>@string/pref_camera_iso_entry_iso400</item> @@ -517,13 +516,12 @@ <!-- Do not localize entryvalues --> <string-array name="pref_camera2_iso_entryvalues"> - <item>@string/pref_camera_iso_value_auto</item> - <item>@string/pref_camera_iso_value_isodeblur</item> - <item>@string/pref_camera_iso_value_iso100</item> - <item>@string/pref_camera_iso_value_iso200</item> - <item>@string/pref_camera_iso_value_iso400</item> - <item>@string/pref_camera_iso_value_iso800</item> - <item>@string/pref_camera_iso_value_iso1600</item> + <item>auto</item> + <item>100</item> + <item>200</item> + <item>400</item> + <item>800</item> + <item>1600</item> </string-array> <!-- Camera Preferences Auto Exposure dialog box entries --> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 59803aeb8..7ee4ae465 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -151,4 +151,18 @@ camera:key="pref_camera2_picturesize_key" camera:singleIcon="@drawable/ic_settings_picturesize" camera:title="@string/pref_camera_picturesize_title"/> + + <IconListPreference + camera:defaultValue="@string/pref_exposure_default" + camera:key="pref_camera2_exposure_key" + camera:singleIcon="@drawable/ic_settings_exposure" + camera:title="@string/pref_exposure_title"/> + + <IconListPreference + camera:defaultValue="@string/pref_camera_iso_default" + camera:entries="@array/pref_camera2_iso_entries" + camera:entryValues="@array/pref_camera2_iso_entryvalues" + camera:key="pref_camera2_iso_key" + camera:singleIcon="@drawable/ic_settings_iso" + camera:title="@string/pref_camera_iso_title"/> </PreferenceGroup> |