From bfdc1037c805a57dc067a2084e6a20edacbf9e81 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Mon, 20 Jan 2014 20:40:32 +0200
Subject: Camera: Powerkey shutter (2/2)

Ported from cm-10.1

Including cm-10.1 camera commit:
aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization.

Includes http://review.cyanogenmod.org/56986

[mikeioannina]: Updates for L

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
---
 res/xml/video_preferences.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'res/xml/video_preferences.xml')

diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 9d0f170bf..151a4f94b 100755
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -190,4 +190,10 @@
             camera:title="@string/pref_camera_zoom_title"
             camera:entries="@array/pref_camera_zoom_entries"
             camera:entryValues="@array/pref_camera_zoom_entryvalues" />
+    <ListPreference
+            camera:key="pref_power_shutter"
+            camera:defaultValue="@string/pref_camera_power_shutter_default"
+            camera:title="@string/pref_camera_power_shutter_title"
+            camera:entries="@array/pref_switch_entries"
+            camera:entryValues="@array/pref_switch_entryvalues" />
 </PreferenceGroup>
-- 
cgit v1.2.3