summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorShuzhen Wang <shuzhenw@codeaurora.org>2016-01-02 20:14:18 +0100
committercodeworkx <codeworkx@cyanogenmod.org>2016-01-02 20:47:57 +0100
commita575c653126a54850ed220b8255f035df4cdfe05 (patch)
tree09519219c8c8e4c3ce987d639e09bcae4ac53f88 /res/values
parent0575f19cf85fc06a070dd1ec15d952126e76d96c (diff)
downloadandroid_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.gz
android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.bz2
android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.zip
SnapdragonCamera: Fix compilation
1. Address compilation due to compiler upgrade. 2. Comment out video dependencies to enable camera. 3. Fix compilation issue due to IMountService interface change. 4. Comment out ExtendedFace. 5. Remove non-standard video resolutions. Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
Diffstat (limited to 'res/values')
-rw-r--r--res/values/qcomstrings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 25a9cdc7d..bb4bd085a 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -174,10 +174,12 @@
<!-- Red eye reduction -->
<string name="pref_camera_redeyereduction_title">Red eye reduction</string>
<string name="pref_camera_redeyereduction_default" translatable="false">disable</string>
+ <string name="pref_camera_redeyereduction_entry_disable">disable</string>
<!-- AE bracketing -->
<string name="pref_camera_ae_bracket_hdr_title">AE bracketing</string>
<string name="pref_camera_ae_bracket_hdr_default" translatable="false">Off</string>
+ <string name="pref_camera_ae_bracket_hdr_entry_off" translatable="false">Off</string>
<!-- High-framerate recording -->
<string name="pref_camera_hfr_title">High-framerate recording</string>