summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-03-19 14:21:14 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-03-19 14:21:14 -0700
commit3409b0d4070c3ff44fb438a7166e8b0ef3f78483 (patch)
tree4c5afea6e27ca7101115f36c346e0cc0a15564b9 /res
parent42b2daeba74f4bb7f689a2b273aa42c00b873912 (diff)
parent71a5b84ebeef715635ffa0ed920a6e17edb69f4e (diff)
downloadandroid_packages_apps_Snap-3409b0d4070c3ff44fb438a7166e8b0ef3f78483.tar.gz
android_packages_apps_Snap-3409b0d4070c3ff44fb438a7166e8b0ef3f78483.tar.bz2
android_packages_apps_Snap-3409b0d4070c3ff44fb438a7166e8b0ef3f78483.zip
Merge "Snapdragon: Add HDR to scene mode menu"
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_scene_mode_hdr.pngbin0 -> 3144 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_hdr.pngbin0 -> 2349 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_hdr.pngbin0 -> 3967 bytes
-rw-r--r--res/values/arrays.xml4
4 files changed, 3 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_scene_mode_hdr.png b/res/drawable-hdpi/ic_scene_mode_hdr.png
new file mode 100644
index 000000000..d6b10af27
--- /dev/null
+++ b/res/drawable-hdpi/ic_scene_mode_hdr.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_hdr.png b/res/drawable-mdpi/ic_scene_mode_hdr.png
new file mode 100644
index 000000000..caf4601ef
--- /dev/null
+++ b/res/drawable-mdpi/ic_scene_mode_hdr.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_hdr.png b/res/drawable-xhdpi/ic_scene_mode_hdr.png
new file mode 100644
index 000000000..d24107512
--- /dev/null
+++ b/res/drawable-xhdpi/ic_scene_mode_hdr.png
Binary files differ
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5ee0c7720..208c3257d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -397,6 +397,7 @@
<!-- Camera Preferences Scene Mode dialog box entries -->
<string-array name="pref_camera_scenemode_entries" translatable="false">
<item>@string/pref_camera_scenemode_entry_auto</item>
+ <item>@string/pref_camera_scenemode_entry_hdr</item>
<item>@string/pref_camera_scenemode_entry_refocus</item>
<item>@string/pref_camera_scenemode_entry_portrait</item>
<item>@string/pref_camera_scenemode_entry_landscape</item>
@@ -412,6 +413,7 @@
<array name="scenemode_thumbnails" translatable="false">
<item>@drawable/ic_scene_mode_auto</item>
+ <item>@drawable/ic_scene_mode_hdr</item>
<item>@drawable/ic_scene_mode_refocus</item>
<item>@drawable/ic_scene_mode_portrait</item>
<item>@drawable/ic_scene_mode_landscape</item>
@@ -443,7 +445,7 @@
<string-array name="pref_camera_scenemode_entryvalues" translatable="false">
<item>auto</item>
-
+ <item>hdr</item>
<item>@string/pref_camera_advanced_feature_value_refocus_on</item>
<item>portrait</item>
<item>landscape</item>