From e57357e650a7fd65b9f8de3b64cdd0cd28f66b58 Mon Sep 17 00:00:00 2001
From: Alok Kediya <kediya@codeaurora.org>
Date: Sat, 28 Sep 2013 18:23:26 +0530
Subject: Camera: Add support for setting DIS

- This patch allows the CamCorder client to
  configure DIS from the UI menu. Supported modes
  by the camera are parsed and dynamically filtered.

(cherry picked from commit 24513b0af17e514aa24100c908432c115a1ddcda)

Change-Id: I7aaacc883eec9d1b91f549d8e76d96f4a6940aed

Conflicts:
	src/com/android/camera/CameraSettings.java
(cherry picked from commit 1278c225500065e8448ad0ea2c6f50abefc5e884)
(cherry picked from commit e093b0988c3c4b5ece6ea7ad5f79796705cd4b21)
---
 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 af9e8501b..ab876b81c 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -96,6 +96,12 @@
             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_dis_key"
+            camera:defaultValue="@string/pref_camera_dis_default"
+            camera:title="@string/pref_camera_dis_title"
+            camera:entries="@array/pref_camera_dis_entries"
+            camera:entryValues="@array/pref_camera_dis_entryvalues" />
     <ListPreference
             camera:key="pref_camera_coloreffect_key"
             camera:defaultValue="@string/pref_camera_coloreffect_default"
-- 
cgit v1.2.3