diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-09-16 17:09:09 -0700 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 15:54:57 -0700 |
commit | 93b6ff2adea4904e0d161fa6ac9524c6fddce502 (patch) | |
tree | 86e64cf27ef2facb832548127a1d3f7cca23405e /res/values | |
parent | c3a465da5ed9ba64512eda37597e96f6ab839fa8 (diff) | |
download | android_packages_apps_Snap-93b6ff2adea4904e0d161fa6ac9524c6fddce502.tar.gz android_packages_apps_Snap-93b6ff2adea4904e0d161fa6ac9524c6fddce502.tar.bz2 android_packages_apps_Snap-93b6ff2adea4904e0d161fa6ac9524c6fddce502.zip |
SnapdragonCamera: Fix flash toggle button
Add flash auto mode to flash toggle button and show flash button
while taking video
Change-Id: Iffc81ba15b1651c45f826a835274c20f46dbb8cd
CRs-Fixed: 1066519
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/camera2arrays.xml | 3 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 3108cf8a3..107ae5bb5 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -321,16 +321,19 @@ <!-- Camera Preferences flash mode dialog box entries --> <string-array name="pref_camera2_flashmode_entries" translatable="false"> <item>@string/pref_camera_flashmode_entry_off</item> + <item>@string/pref_camera_flashmode_entry_auto</item> <item>@string/pref_camera_flashmode_entry_on</item> </string-array> <string-array name="pref_camera2_flashmode_labels" translatable="false"> <item>@string/pref_camera_flashmode_label_off</item> + <item>@string/pref_camera_flashmode_label_auto</item> <item>@string/pref_camera_flashmode_label_on</item> </string-array> <string-array name="pref_camera2_flashmode_entryvalues" translatable="false"> <item>@string/setting_off_value</item> + <item>@string/pref_camera2_flashmode_value_auto</item> <item>@string/setting_on_value</item> </string-array> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index b6e6afdce..b7d30bca7 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -999,7 +999,7 @@ <string name="pref_camera2_scenemode_default" translatable="false">0</string> <string name="pref_camera2_whitebalance_default" translatable="false">1</string> <string name="pref_camera2_coloreffect_default" translatable="false">0</string> - <string name="pref_camera2_flashmode_default" translatable="false">@string/setting_off_value</string> + <string name="pref_camera2_flashmode_value_auto" translatable="false">auto</string> <string name="pref_camera2_makeup_title" translatable="true">Makeup</string> |