diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-26 16:01:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 16:01:44 -0700 |
| commit | 83884a45c397484ceeaa80e9d3f2e3a4ccd78b0a (patch) | |
| tree | a749a0bf9ca7ad58297a20f90e85dc23b3ed9db8 /res/values | |
| parent | b29ff19e2ebd00e502ecbaae2aee5d97168c37f7 (diff) | |
| parent | 8021e39d649be4603e66d5f82cef607ada87d56b (diff) | |
| download | android_packages_apps_Gallery2-83884a45c397484ceeaa80e9d3f2e3a4ccd78b0a.tar.gz android_packages_apps_Gallery2-83884a45c397484ceeaa80e9d3f2e3a4ccd78b0a.tar.bz2 android_packages_apps_Gallery2-83884a45c397484ceeaa80e9d3f2e3a4ccd78b0a.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.xml | 8 |
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> |