diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-02-25 10:46:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-02-25 10:46:02 -0800 |
| commit | 065445dfd5348cf2c3a50565a82339bb69bc4ab8 (patch) | |
| tree | 87e8f550f0774cfced08a237622f1db41b7ba7e9 /res | |
| parent | 29406d98416c4716bfc6daf92aba954a32c91f8f (diff) | |
| parent | f933f8ac4bed42a9b39f961f189f63e12ece4240 (diff) | |
| download | android_packages_apps_Snap-065445dfd5348cf2c3a50565a82339bb69bc4ab8.tar.gz android_packages_apps_Snap-065445dfd5348cf2c3a50565a82339bb69bc4ab8.tar.bz2 android_packages_apps_Snap-065445dfd5348cf2c3a50565a82339bb69bc4ab8.zip | |
Merge "SnapdragonCamera: Add new video frame rate" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/qcomarrays.xml | 2 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 5b99bdc28..e078477ba 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -421,6 +421,7 @@ <item>@string/pref_camera_hfr_entry_hsr_60</item> <item>@string/pref_camera_hfr_entry_hsr_90</item> <item>@string/pref_camera_hfr_entry_hsr_120</item> + <item>@string/pref_camera_hfr_entry_hsr_240</item> </string-array> <!-- Do not localize entryvalues --> @@ -433,6 +434,7 @@ <item>@string/pref_camera_hfr_value_hsr_60</item> <item>@string/pref_camera_hfr_value_hsr_90</item> <item>@string/pref_camera_hfr_value_hsr_120</item> + <item>@string/pref_camera_hfr_value_hsr_240</item> </string-array> <!-- Video Preferences Noise Reduction dialog box entries --> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 97576fbae..b58ba702f 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -384,6 +384,7 @@ <string name="pref_camera_hfr_entry_hsr_60">HSR 60</string> <string name="pref_camera_hfr_entry_hsr_90">HSR 90</string> <string name="pref_camera_hfr_entry_hsr_120">HSR 120</string> + <string name="pref_camera_hfr_entry_hsr_240">HSR 240</string> <!-- HFR entry values. Do not translate. --> <string name="pref_camera_hfr_value_off">off</string> @@ -394,6 +395,7 @@ <string name="pref_camera_hfr_value_hsr_60">hsr60</string> <string name="pref_camera_hfr_value_hsr_90">hsr90</string> <string name="pref_camera_hfr_value_hsr_120">hsr120</string> + <string name="pref_camera_hfr_value_hsr_240">hsr240</string> <!-- Default noise reduction setting. Do not translate. --> <string name="pref_camera_noise_reduction_default">off</string> |