diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:50:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:50:54 -0700 |
| commit | bad5188620be4868156da276cf8ba890288d1987 (patch) | |
| tree | ab46756cb70019452b1bb73833cea5990d7e9d8a /res | |
| parent | a2b6a691f7e9eb88a4ab44e01381d7a1682e5d77 (diff) | |
| parent | a02710a35bfd859dbaae3557d4f278d5b1a80ab6 (diff) | |
| download | android_packages_apps_Snap-bad5188620be4868156da276cf8ba890288d1987.tar.gz android_packages_apps_Snap-bad5188620be4868156da276cf8ba890288d1987.tar.bz2 android_packages_apps_Snap-bad5188620be4868156da276cf8ba890288d1987.zip | |
Merge "SnapdragonCamera: FrameProcessor" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/camera2arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 1 | ||||
| -rw-r--r-- | res/xml/capture_preferences.xml | 7 |
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 974ac2356..a808ba354 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -981,5 +981,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> |