From 93b6ff2adea4904e0d161fa6ac9524c6fddce502 Mon Sep 17 00:00:00 2001
From: Byunghun Jeon <bjeon@codeaurora.org>
Date: Fri, 16 Sep 2016 17:09:09 -0700
Subject: 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
---
 res/xml/capture_preferences.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 64633c362..93b55bde1 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -31,13 +31,10 @@
     xmlns:camera="http://schemas.android.com/apk/res/org.codeaurora.snapcam"
     camera:title="@string/pref_camera_settings_category">
     <IconListPreference
-        camera:defaultValue="@string/pref_camera2_flashmode_default"
+        camera:defaultValue="@string/pref_camera2_flashmode_value_auto"
         camera:entries="@array/pref_camera2_flashmode_entries"
         camera:entryValues="@array/pref_camera2_flashmode_entryvalues"
-        camera:icons="@array/pref_camera2_flashmode_icons"
         camera:key="pref_camera2_flashmode_key"
-        camera:labelList="@array/pref_camera2_flashmode_labels"
-        camera:largeIcons="@array/pref_camera2_flashmode_largeicons"
         camera:singleIcon="@drawable/ic_settings_flash"
         camera:title="@string/pref_camera_flashmode_title"/>
 
@@ -234,6 +231,15 @@
         camera:key="pref_camera2_noise_reduction_key"
         camera:title="@string/pref_camera_noise_reduction_title"/>
 
+    <IconListPreference
+        camera:defaultValue="@string/pref_camera_video_flashmode_default"
+        camera:entries="@array/pref_camera2_video_flashmode_entries"
+        camera:entryValues="@array/pref_camera2_video_flashmode_entryvalues"
+        camera:icons="@array/video_flashmode_icons"
+        camera:key="pref_camera2_video_flashmode_key"
+        camera:singleIcon="@drawable/ic_settings_flash"
+        camera:title="@string/pref_camera_flashmode_title" />
+
     <ListPreference
         camera:defaultValue="@string/pref_camera_video_rotation_default"
         camera:entries="@array/pref_camera2_video_rotation_entries"
-- 
cgit v1.2.3