summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-05-29 04:35:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-05-29 04:35:36 -0700
commite5e252a8cb65729918458e65bcee437816ccec0b (patch)
tree7d346ba88c0ee9851d2d738d13446da75e300d18
parent0acf68774be2398397c0dba64a756331fed8d85f (diff)
parent6b79f2324af26cdbb7d0e51b0422b18f4a0f2a62 (diff)
downloadandroid_packages_apps_Snap-e5e252a8cb65729918458e65bcee437816ccec0b.tar.gz
android_packages_apps_Snap-e5e252a8cb65729918458e65bcee437816ccec0b.tar.bz2
android_packages_apps_Snap-e5e252a8cb65729918458e65bcee437816ccec0b.zip
Merge "Camera2: Fix Histogram display adverse in Chinese mode"
-rw-r--r--res/values/qcomarrays.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index dfdd67cd3..cd0da7a83 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -394,8 +394,8 @@
<!-- Camera Preferences Histogram dialog box entries -->
<string-array name="pref_camera_histogram_entries">
- <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 -->
@@ -418,8 +418,8 @@
<!-- Do not localize entryvalues -->
<string-array name="pref_camera_histogram_entryvalues">
- <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 -->