summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2015-12-17 16:53:36 -0800
committerCamera Software Integration <camswint@localhost>2016-01-24 13:02:06 -0700
commit5cca0e8991ee9fa3f30805944390055d410fefd3 (patch)
tree01fcb7be2cab284e83e3267e100b893c63e72364 /res/xml
parentd8d2eb6ce6d67354be9c38f9a23c7b9cd22457d2 (diff)
downloadandroid_packages_apps_Snap-5cca0e8991ee9fa3f30805944390055d410fefd3.tar.gz
android_packages_apps_Snap-5cca0e8991ee9fa3f30805944390055d410fefd3.tar.bz2
android_packages_apps_Snap-5cca0e8991ee9fa3f30805944390055d410fefd3.zip
SnapdragonCamera: Color Effect shows the current status
Let the icon shows the current status of the color effect on/off Change-Id: I1c3719db15d4dd920b89591064cda372c7ab89be CRs-Fixed: 951550
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/camera_preferences.xml9
-rw-r--r--res/xml/video_preferences.xml9
2 files changed, 18 insertions, 0 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index c6e625835..8a0668fa0 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -149,6 +149,15 @@
camera:entries="@array/pref_camera_facerc_entries"
camera:entryValues="@array/pref_camera_facerc_entryvalues" />
<IconListPreference
+ camera:key="pref_camera_filter_mode_key"
+ camera:defaultValue="@string/pref_camera_coloreffect_default"
+ camera:title="@string/pref_camera_filter_mode_title"
+ camera:entries="@array/pref_camera_filter_mode_entries"
+ camera:singleIcon="@drawable/ic_settings_filter"
+ camera:icons="@array/pref_filter_mode_icons"
+ camera:largeIcons="@array/pref_filter_mode_icons"
+ camera:entryValues="@array/pref_camera_filter_mode_entryvalues" />
+ <IconListPreference
camera:key="pref_camera_coloreffect_key"
camera:defaultValue="@string/pref_camera_coloreffect_default"
camera:title="@string/pref_camera_coloreffect_title"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index f9949d4e1..0184bad1a 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -119,6 +119,15 @@
camera:singleIcon="@drawable/ic_eis_menu"
camera:entryValues="@array/pref_camera_dis_entryvalues" />
<IconListPreference
+ camera:key="pref_camera_filter_mode_key"
+ camera:defaultValue="@string/pref_camera_coloreffect_default"
+ camera:title="@string/pref_camera_filter_mode_title"
+ camera:entries="@array/pref_camera_filter_mode_entries"
+ camera:singleIcon="@drawable/ic_settings_filter"
+ camera:icons="@array/pref_filter_mode_icons"
+ camera:largeIcons="@array/pref_filter_mode_icons"
+ camera:entryValues="@array/pref_camera_filter_mode_entryvalues" />
+ <IconListPreference
camera:key="pref_camera_coloreffect_key"
camera:defaultValue="@string/pref_camera_coloreffect_default"
camera:title="@string/pref_camera_coloreffect_title"