summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-04-06 16:07:22 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-21 18:45:51 -0700
commitf3db9356da2a5cdb8372e186c597c83c52d421e6 (patch)
tree070868c8336c8dfe162920dc5cd8850a0a346a2d /res
parent48f72ee9ef618d31e9a08bb7ad66b3ca8da67b9f (diff)
downloadandroid_packages_apps_Snap-f3db9356da2a5cdb8372e186c597c83c52d421e6.tar.gz
android_packages_apps_Snap-f3db9356da2a5cdb8372e186c597c83c52d421e6.tar.bz2
android_packages_apps_Snap-f3db9356da2a5cdb8372e186c597c83c52d421e6.zip
SnapdragonCamera: FrameProcessor
Introducing Frameprocessor with beautifiation. Change-Id: Ie6d8f4157a7d0c1a21e6f347457e84685e397286 CRs-Fixed: 1023183
Diffstat (limited to 'res')
-rw-r--r--res/values/camera2arrays.xml10
-rw-r--r--res/values/qcomstrings.xml1
-rw-r--r--res/xml/capture_preferences.xml7
3 files changed, 18 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 59e06f260..49f37e139 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -60,6 +60,16 @@
<item>front</item>
</string-array>
+ <string-array name="pref_camera2_makeup_entries" translatable="true">
+ <item>On</item>
+ <item>Off</item>
+ </string-array>
+
+ <string-array name="pref_camera2_makeup_entryvalues" translatable="false">
+ <item>on</item>
+ <item>off</item>
+ </string-array>
+
<string-array name="pref_camera2_mono_preview_entries" translatable="true">
<item>@string/pref_camera2_mono_preview_entry_on</item>
<item>@string/pref_camera2_mono_preview_entry_off</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index e6656e9ce..8273210d4 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -564,5 +564,6 @@
<string name="pref_camera2_whitebalance_default" translatable="false">1</string>
<string name="pref_camera2_coloreffect_default" translatable="false">0</string>
<string name="pref_camera2_flashmode_default" translatable="false">2</string>
+ <string name="pref_camera2_makeup_title" translatable="true">Makeup</string>
</resources>
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 3dad3a701..5e9235e34 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -183,4 +183,11 @@
camera:key="pref_camera2_initial_camera_key"
camera:entries="@array/pref_camera2_initial_camera_entries"
camera:entryValues="@array/pref_camera2_initial_camera_entryvalues"/>
+
+ <ListPreference
+ camera:defaultValue="off"
+ camera:key="pref_camera2_makeup_key"
+ camera:entries="@array/pref_camera2_makeup_entries"
+ camera:entryValues="@array/pref_camera2_makeup_entryvalues"
+ camera:title="@string/pref_camera2_makeup_title"/>
</PreferenceGroup>