summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2009-11-05 01:32:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-05 01:32:00 -0800
commit3a8b1c4e1ef1b45443a53fb6f9ff0fcb754517a7 (patch)
tree06cb54d2049da6fccb5f35959f4de2d4fff47113 /res
parent1c16c66f7dfd2f36a724b28a49e9f4d7029d46cb (diff)
parentf8c4fbee0762c3cce995e8aa234b7ab7f98e5c68 (diff)
downloadLegacyCamera-3a8b1c4e1ef1b45443a53fb6f9ff0fcb754517a7.zip
LegacyCamera-3a8b1c4e1ef1b45443a53fb6f9ff0fcb754517a7.tar.gz
LegacyCamera-3a8b1c4e1ef1b45443a53fb6f9ff0fcb754517a7.tar.bz2
am f8c4fbee: am f733d7ba: am 7cbd151e: Merge change I834b0640 into eclair
Merge commit 'f8c4fbee0762c3cce995e8aa234b7ab7f98e5c68' * commit 'f8c4fbee0762c3cce995e8aa234b7ab7f98e5c68': Remove whiteboard and blackboard color effects.
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f95a1df..35e9d70 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -199,8 +199,6 @@
<item>@string/pref_camera_coloreffect_entry_negative</item>
<item>@string/pref_camera_coloreffect_entry_solarize</item>
<item>@string/pref_camera_coloreffect_entry_posterize</item>
- <item>@string/pref_camera_coloreffect_entry_whiteboard</item>
- <item>@string/pref_camera_coloreffect_entry_blackboard</item>
<item>@string/pref_camera_coloreffect_entry_aqua</item>
<item>@string/pref_camera_coloreffect_entry_pastel</item>
<item>@string/pref_camera_coloreffect_entry_mosaic</item>
@@ -216,8 +214,6 @@
<item>negative</item>
<item>solarize</item>
<item>posterize</item>
- <item>whiteboard</item>
- <item>blackboard</item>
<item>aqua</item>
<item>pastel</item>
<item>mosaic</item>