summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-04-25 18:07:55 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-25 18:07:55 -0700
commit811c7a43a2c32861784936407aa9b6a39083f108 (patch)
tree4733784c6470358c0971eb2a1022d6828bdead4e /res
parente99e09065329b0a7a331ffc68b5b543809b653c9 (diff)
parentb2b78aa11a0e5c90e81ba19ffdaa32044519a9d9 (diff)
downloadandroid_packages_apps_Snap-811c7a43a2c32861784936407aa9b6a39083f108.tar.gz
android_packages_apps_Snap-811c7a43a2c32861784936407aa9b6a39083f108.tar.bz2
android_packages_apps_Snap-811c7a43a2c32861784936407aa9b6a39083f108.zip
Merge "SnapdragonCamera: Fix no flash settings menu" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7f6143e6e..40b55892f 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -361,13 +361,13 @@
<!-- Videocamera Preferences flash mode dialog box entries -->
<string-array name="pref_camera_video_flashmode_entries" translatable="false">
- <item>@string/pref_camera_flashmode_entry_on</item>
<item>@string/pref_camera_flashmode_entry_off</item>
+ <item>@string/pref_camera_flashmode_entry_on</item>
</string-array>
<string-array name="pref_camera_video_flashmode_labels" translatable="false">
- <item>@string/pref_camera_flashmode_label_on</item>
<item>@string/pref_camera_flashmode_label_off</item>
+ <item>@string/pref_camera_flashmode_label_on</item>
</string-array>
<string-array name="pref_camera_video_flashmode_entryvalues" translatable="false">
@@ -376,13 +376,13 @@
</string-array>
<array name="video_flashmode_icons" translatable="false">
- <item>@drawable/ic_flash_on_holo_light</item>
<item>@drawable/ic_flash_off_holo_light</item>
+ <item>@drawable/ic_flash_on_holo_light</item>
</array>
<array name="video_flashmode_largeicons" translatable="false">
- <item>@drawable/ic_flash_on_holo_light</item>
<item>@drawable/ic_flash_off_holo_light</item>
+ <item>@drawable/ic_flash_on_holo_light</item>
</array>
<string-array name="pref_camera_recordlocation_entryvalues" translatable="false">