From 0dc64ffddb06d0b41e65f10c742caec52e8b0436 Mon Sep 17 00:00:00 2001
From: Alok Kediya <kediya@codeaurora.org>
Date: Fri, 27 Sep 2013 20:22:45 +0530
Subject: Camera : Enable camera and camcorder UI features..

Added keys and APIs for enabling QC features from UI.

(cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21)

Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8

Conflicts:
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/PhotoMenu.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/VideoModule.java

Conflicts:
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/VideoModule.java
(cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376)
(cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
---
 res/xml/video_preferences.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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

diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 08dbc0039..8fecb7116 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -90,4 +90,28 @@
             camera:largeIcons="@array/camera_recordlocation_largeicons"
             camera:entries="@array/pref_camera_recordlocation_entries"
             camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_powermode_key"
+            camera:defaultValue="@string/pref_camera_powermode_default"
+            camera:title="@string/pref_camera_powermode_title"
+            camera:entries="@array/pref_camera_powermode_entries"
+            camera:entryValues="@array/pref_camera_powermode_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_coloreffect_key"
+            camera:defaultValue="@string/pref_camera_coloreffect_default"
+            camera:title="@string/pref_camera_coloreffect_title"
+            camera:entries="@array/pref_camera_coloreffect_entries"
+            camera:entryValues="@array/pref_camera_coloreffect_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_hfr_key"
+            camera:defaultValue="@string/pref_camera_hfr_default"
+            camera:title="@string/pref_camera_hfr_title"
+            camera:entries="@array/pref_camera_hfr_entries"
+            camera:entryValues="@array/pref_camera_hfr_entryvalues"/>
+    <ListPreference
+            camera:key="pref_camera_videosnapsize_key"
+            camera:defaultValue="@string/pref_camera_videosnapsize_default"
+            camera:title="@string/pref_camera_picturesize_title"
+            camera:entries="@array/pref_camera_picturesize_entries"
+            camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
 </PreferenceGroup>
-- 
cgit v1.2.3