summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-26 16:01:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-26 16:01:44 -0700
commit87ea8cf55157fd2a540285a8c94d5128970c62fe (patch)
tree595dd95748639a16e74d41f899b6241dec3dfefb /res/values
parentaa65998a5de7106d16213c78f57e0039669034cf (diff)
parent5cdaaf84486306bea697a4e3487cda3c8e4815cb (diff)
downloadandroid_packages_apps_Snap-87ea8cf55157fd2a540285a8c94d5128970c62fe.tar.gz
android_packages_apps_Snap-87ea8cf55157fd2a540285a8c94d5128970c62fe.tar.bz2
android_packages_apps_Snap-87ea8cf55157fd2a540285a8c94d5128970c62fe.zip
am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce
* commit '8021e39d649be4603e66d5f82cef607ada87d56b': Add new indicators
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7ad62fa56..0f010291d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -324,6 +324,14 @@
<item>@drawable/ic_wb_cloudy</item>
</array>
+ <array name="camera_wb_indicators" translatable="false">
+ <item>@drawable/ic_indicator_wb_tungsten</item>
+ <item>@drawable/ic_indicator_wb_fluorescent</item>
+ <item>@drawable/ic_indicator_wb_off</item>
+ <item>@drawable/ic_indicator_wb_daylight</item>
+ <item>@drawable/ic_indicator_wb_cloudy</item>
+ </array>
+
<!-- Camera Preferences Scene Mode dialog box entries -->
<string-array name="pref_camera_scenemode_entries" translatable="false">
<item>@string/pref_camera_scenemode_entry_action</item>