summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorxianming wang <mingwax@codeaurora.org>2018-09-28 17:48:58 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-10-19 00:16:55 -0700
commit25056018dc026dc42bfcd002475374439063753c (patch)
tree2cd9b00a3bb6315256a4db6968799f9b308a0ab5 /res
parentc270e957c3aa214cb833c453a059d5a035670cfe (diff)
downloadandroid_packages_apps_Snap-25056018dc026dc42bfcd002475374439063753c.tar.gz
android_packages_apps_Snap-25056018dc026dc42bfcd002475374439063753c.tar.bz2
android_packages_apps_Snap-25056018dc026dc42bfcd002475374439063753c.zip
SnapdragonCamera: Revert the original design of ISO
Revert the original design of ISO in ProMode, add 3200ISO like the original design. CRs-Fixed: 2328914 Change-Id: I4ec658f2cc451a5515c50861d590e831ca10ad52
Diffstat (limited to 'res')
-rwxr-xr-xres/values/camera2arrays.xml2
-rwxr-xr-xres/values/qcomstrings.xml4
-rwxr-xr-xres/xml/capture_preferences.xml2
3 files changed, 6 insertions, 2 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 6d03c50f5..c995841b4 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -644,6 +644,7 @@
<item>@string/pref_camera_iso_entry_iso400</item>
<item>@string/pref_camera_iso_entry_iso800</item>
<item>@string/pref_camera_iso_entry_iso1600</item>
+ <item>@string/pref_camera_iso_entry_iso3200</item>
</string-array>
<!-- Do not localize entryvalues -->
@@ -654,6 +655,7 @@
<item>400</item>
<item>800</item>
<item>1600</item>
+ <item>3200</item>
</string-array>
<!-- Camera Preferences Auto Exposure dialog box entries -->
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 403fc8b7b..e987e6bf1 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -465,7 +465,7 @@
<string name="pref_camera_denoise_entry_on">On</string>
<!-- Default iso setting. Do not translate. -->
- <string name="pref_camera_iso_default">100</string>
+ <string name="pref_camera_iso_default">auto</string>
<!-- Settings screen, Select Iso title -->
<string name="pref_camera_iso_title">ISO</string>
@@ -478,6 +478,7 @@
<string name="pref_camera_iso_entry_iso400">ISO400</string>
<string name="pref_camera_iso_entry_iso800">ISO800</string>
<string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+ <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
<!-- ISO entry values. Do not translate. -->
<string name="pref_camera_iso_value_auto">auto</string>
@@ -487,6 +488,7 @@
<string name="pref_camera_iso_value_iso400">ISO400</string>
<string name="pref_camera_iso_value_iso800">ISO800</string>
<string name="pref_camera_iso_value_iso1600">ISO1600</string>
+ <string name="pref_camera_iso_value_iso3200">ISO3200</string>
<!-- Settings screen, Anti Banding title -->
<string name="pref_camera_antibanding_title">Anti Banding</string>
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 6aa159555..fb233d3c6 100755
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -174,7 +174,7 @@
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_manual_iso_key"
+ camera:key="pref_camera2_iso_key"
camera:singleIcon="@drawable/ic_settings_iso"
camera:title="@string/pref_camera_iso_title"/>