summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-06-07 22:49:38 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-06-07 22:49:38 -0700
commit3a6191654425af596f911f794cf18d7c2161e7e6 (patch)
tree56fe337b972302c7b1c9f1a5671ff5d39257d4e3 /res
parentf034e76e93b2e32e0002b79189cabd53dbb6280b (diff)
parent582f442b22a10f64ed99ac1efb151d444350c9f2 (diff)
downloadandroid_packages_apps_Snap-3a6191654425af596f911f794cf18d7c2161e7e6.tar.gz
android_packages_apps_Snap-3a6191654425af596f911f794cf18d7c2161e7e6.tar.bz2
android_packages_apps_Snap-3a6191654425af596f911f794cf18d7c2161e7e6.zip
Merge "SnapdragonCamera: Fix front camera and scene mode picture taking issues" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
-rw-r--r--res/values/camera2arrays.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 8e54a2abc..9b7db30f6 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -83,11 +83,11 @@
<!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
-1 refers to ones not supported in Camera2 API
0 is special case added for auto (meaning off)
- -5 is for dual mode
+ 100 is for dual mode (Custom-Scenemodes start from 100)
-->
<string-array name="pref_camera2_scenemode_entryvalues" translatable="false">
<item>0</item>
- <item>-5</item>
+ <item>100</item>
<item>18</item>
<item>-1</item>
<item>-1</item>