diff options
| author | Abhijit Trivedi <abhijitt@quicinc.com> | 2018-11-01 15:52:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-01 15:52:17 -0700 |
| commit | e152edac5288306bfa17a640f7d94ea8524a16df (patch) | |
| tree | c849b2059fedc9bfbecd4653e04dcad75af42dde /res | |
| parent | b121312007ffd73feedccbcfec43c4b741cddd0c (diff) | |
| parent | 25056018dc026dc42bfcd002475374439063753c (diff) | |
| download | android_packages_apps_Snap-e152edac5288306bfa17a640f7d94ea8524a16df.tar.gz android_packages_apps_Snap-e152edac5288306bfa17a640f7d94ea8524a16df.tar.bz2 android_packages_apps_Snap-e152edac5288306bfa17a640f7d94ea8524a16df.zip | |
Merge "SnapdragonCamera: Revert the original design of ISO" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/camera2arrays.xml | 2 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 4 | ||||
| -rwxr-xr-x | res/xml/capture_preferences.xml | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 70aa6c7c0..a6d312ab3 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -646,6 +646,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 --> @@ -656,6 +657,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 1d1a8325e..fecc7d1c1 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 2ecad2e88..d92c43150 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"/> |