summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2014-10-04 06:29:44 +0200
committerArne Coucheron <arco68@gmail.com>2014-10-05 18:30:07 +0000
commit85130b37d8f1b6e4c010034de7daeaa88ae66c26 (patch)
tree0a84cfab3ee2e7ca36ce76558422e070e11963a6 /res
parentca45a9866ac5d8817a9941e354dfcfc1d110ef5d (diff)
downloadandroid_packages_apps_Camera2-85130b37d8f1b6e4c010034de7daeaa88ae66c26.tar.gz
android_packages_apps_Camera2-85130b37d8f1b6e4c010034de7daeaa88ae66c26.tar.bz2
android_packages_apps_Camera2-85130b37d8f1b6e4c010034de7daeaa88ae66c26.zip
Camera: Fix histogram on/off states
* It made the intended behavior reverted. Histogram mode was being set as enabled by default, but the histogram graph was not shown on screen. When disabling histogram feature, then the graph was being displayed. In other words, completely opposite of how it should work. * Moving disable values before enable values seems to fix this. Change-Id: Ib6b0fbc3ce1664d448e169463f557f91b2d8d74a
Diffstat (limited to 'res')
-rw-r--r--res/values/qcomarrays.xml4
-rw-r--r--res/values/qcomstrings.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 124dc5751..a94fd6b29 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -402,8 +402,8 @@
<!-- Camera Preferences Histogram dialog box entries -->
<string-array name="pref_camera_histogram_entries" translatable="false">
- <item>@string/pref_camera_histogram_entry_enable</item>
<item>@string/pref_camera_histogram_entry_disable</item>
+ <item>@string/pref_camera_histogram_entry_enable</item>
</string-array>
<!-- Video Preferences High Frame Rate dialog box entries -->
@@ -424,8 +424,8 @@
<!-- Do not localize entryvalues -->
<string-array name="pref_camera_histogram_entryvalues" translatable="false">
- <item>@string/pref_camera_histogram_value_enable</item>
<item>@string/pref_camera_histogram_value_disable</item>
+ <item>@string/pref_camera_histogram_value_enable</item>
</string-array>
<!-- Camera Preferences Face Detection dialog box entries -->
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index a396793a6..919d6be7b 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -515,12 +515,12 @@
<string name="pref_camera_histogram_title">Histogram</string>
<!-- Settings screen, Histogram radio button choices -->
- <string name="pref_camera_histogram_entry_enable">On</string>
<string name="pref_camera_histogram_entry_disable">Off</string>
+ <string name="pref_camera_histogram_entry_enable">On</string>
<!-- Histogram entry values. Do not translate. -->
- <string name="pref_camera_histogram_value_enable" translatable="false">enable</string>
<string name="pref_camera_histogram_value_disable" translatable="false">disable</string>
+ <string name="pref_camera_histogram_value_enable" translatable="false">enable</string>
<!-- Default auto scene detection setting. -->
<string name="pref_camera_scenedetect_default" translatable="false">off</string>