summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-08-25 11:17:57 -0700
committerJay Wang <jaywang@codeaurora.org>2016-09-27 15:54:53 -0700
commitda315cfe9dcff36827dcf3cbaff53d823a4d228b (patch)
tree0ccf641d03ce3369b6475b8f369919b49bc745d5 /res
parent7dd609bbc372c2bbeb9e3c10fe567e085da4f15d (diff)
downloadandroid_packages_apps_Snap-da315cfe9dcff36827dcf3cbaff53d823a4d228b.tar.gz
android_packages_apps_Snap-da315cfe9dcff36827dcf3cbaff53d823a4d228b.tar.bz2
android_packages_apps_Snap-da315cfe9dcff36827dcf3cbaff53d823a4d228b.zip
SnapdragonCamera: Chromaflash Filter
Adding Chromaflash Filter for Camera2 Change-Id: I04b399abe26a3fdcdc91240036a683711b21f8a8 CRs-Fixed: 1067848
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/chroma_flash.pngbin0 -> 1534 bytes
-rw-r--r--res/values/camera2arrays.xml3
-rw-r--r--res/values/qcomstrings.xml1
3 files changed, 4 insertions, 0 deletions
diff --git a/res/drawable-hdpi/chroma_flash.png b/res/drawable-hdpi/chroma_flash.png
new file mode 100644
index 000000000..97cdc790d
--- /dev/null
+++ b/res/drawable-hdpi/chroma_flash.png
Binary files differ
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 453627b2c..f4c17d6c4 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -134,6 +134,7 @@
<item>9</item>
<item>-1</item>
<item>103</item>
+ <item>105</item>
<item>104</item>
</string-array>
@@ -156,6 +157,7 @@
<item>@string/pref_camera_scenemode_entry_snow</item>
<item>@string/pref_camera_scenemode_entry_asd</item>
<item>@string/pref_camera_scenemode_entry_bestpicture</item>
+ <item>@string/pref_camera_scenemode_entry_chromaflash</item>
<item>@string/pref_camera_scenemode_entry_panorama</item>
</string-array>
@@ -177,6 +179,7 @@
<item>@drawable/snow</item>
<item>@drawable/ic_scene_mode_smartauto</item>
<item>@drawable/pick_the_best_photo</item>
+ <item>@drawable/chroma_flash</item>
<item>@drawable/scene_panorama</item>
</array>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index c27ec976a..04bebfc16 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1024,6 +1024,7 @@
<string name="pref_camera2_videosnap_entry_disable" translatable="true">Disable</string>
<string name="pref_camera2_trackingfocus_title" translatable="true">Tracking Focus</string>
<string name="pref_camera_scenemode_entry_bestpicture" translatable="true">BestPicture</string>
+ <string name="pref_camera_scenemode_entry_chromaflash" translatable="true">ChromaFlash</string>
<string name="pref_camera_scenemode_entry_panorama" translatable="true">Panorama</string>
<string name="bestpicture_done" translatable="true">DONE</string>
<string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string>