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)

2 files changed, 144 insertions, 3 deletions

diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 975a15dea..558194fc0 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -37,9 +37,6 @@
             camera:title="@string/pref_camera_scenemode_title"
             camera:singleIcon="@drawable/ic_sce"
             camera:entries="@array/pref_camera_scenemode_entries"
-            camera:labelList="@array/pref_camera_scenemode_labels"
-            camera:icons="@array/pref_camera_scenemode_icons"
-            camera:largeIcons="@array/pref_camera_scenemode_icons"
             camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
     <IconListPreference
             camera:key="pref_camera_whitebalance_key"
@@ -107,4 +104,124 @@
             camera:title="@string/pref_camera_timer_sound_title"
             camera:entries="@array/pref_camera_timer_sound_entries"
             camera:entryValues="@array/pref_camera_timer_sound_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_scenedetect_key"
+            camera:defaultValue="@string/pref_camera_scenedetect_default"
+            camera:title="@string/pref_camera_scenedetect_title"
+            camera:entries="@array/pref_camera_scenedetect_entries"
+            camera:entryValues="@array/pref_camera_scenedetect_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_facerc_key"
+            camera:defaultValue="@string/pref_camera_facerc_default"
+            camera:title="@string/pref_camera_facerc_title"
+            camera:entries="@array/pref_camera_facerc_entries"
+            camera:entryValues="@array/pref_camera_facerc_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_jpegquality_key"
+            camera:defaultValue="@string/pref_camera_jpegquality_default"
+            camera:title="@string/pref_camera_jpegquality_title"
+            camera:entries="@array/pref_camera_jpegquality_entries"
+            camera:entryValues="@array/pref_camera_jpegquality_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_touchafaec_key"
+            camera:defaultValue="@string/pref_camera_touchafaec_default"
+            camera:title="@string/pref_camera_touchafaec_title"
+            camera:entries="@array/pref_camera_touchafaec_entries"
+            camera:entryValues="@array/pref_camera_touchafaec_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_iso_key"
+            camera:defaultValue="@string/pref_camera_iso_default"
+            camera:title="@string/pref_camera_iso_title"
+            camera:entries="@array/pref_camera_iso_entries"
+            camera:entryValues="@array/pref_camera_iso_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_histogram_key"
+            camera:defaultValue="@string/pref_camera_histogram_default"
+            camera:title="@string/pref_camera_histogram_title"
+            camera:entries="@array/pref_camera_histogram_entries"
+            camera:entryValues="@array/pref_camera_histogram_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_antibanding_key"
+            camera:defaultValue="@string/pref_camera_antibanding_default"
+            camera:title="@string/pref_camera_antibanding_title"
+            camera:entries="@array/pref_camera_antibanding_entries"
+            camera:entryValues="@array/pref_camera_antibanding_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_pictureformat_key"
+            camera:defaultValue="@string/pref_camera_picture_format_default"
+            camera:title="@string/pref_camera_picture_format_title"
+            camera:entries="@array/pref_camera_picture_format_entries"
+            camera:entryValues="@array/pref_camera_picture_format_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_sharpness_key"
+            camera:defaultValue="@string/pref_camera_sharpness_default"
+            camera:title="@string/pref_camera_sharpness_title"
+            camera:entries="@array/pref_camera_sharpness_entries"
+            camera:entryValues="@array/pref_camera_multilevel_sharpness_entryvalues"/>
+    <ListPreference
+            camera:key="pref_camera_contrast_key"
+            camera:defaultValue="@string/pref_camera_contrast_default"
+            camera:title="@string/pref_camera_contrast_title"
+            camera:entries="@array/pref_camera_contrast_entries"
+            camera:entryValues="@array/pref_camera_multilevel_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_saturation_key"
+            camera:defaultValue="@string/pref_camera_saturation_default"
+            camera:title="@string/pref_camera_saturation_title"
+            camera:entries="@array/pref_camera_saturation_entries"
+            camera:entryValues="@array/pref_camera_multilevel_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_denoise_key"
+            camera:defaultValue="@string/pref_camera_denoise_default"
+            camera:title="@string/pref_camera_denoise_title"
+            camera:entries="@array/pref_camera_denoise_entries"
+            camera:entryValues="@array/pref_camera_denoise_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_autoexposure_key"
+            camera:defaultValue="@string/pref_camera_autoexposure_default"
+            camera:title="@string/pref_camera_autoexposure_title"
+            camera:entries="@array/pref_camera_autoexposure_entries"
+            camera:entryValues="@array/pref_camera_autoexposure_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_skinToneEnhancement_key"
+            camera:defaultValue="@string/pref_camera_skinToneEnhancement_default"
+            camera:title="@string/pref_camera_skinToneEnhancement_title"
+            camera:entries="@array/pref_camera_skinToneEnhancement_entries"
+            camera:entryValues="@array/pref_camera_skinToneEnhancement_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_facedetection_key"
+            camera:defaultValue="@string/pref_camera_facedetection_default"
+            camera:title="@string/pref_camera_facedetection_title"
+            camera:entries="@array/pref_camera_facedetection_entries"
+            camera:entryValues="@array/pref_camera_facedetection_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_redeyereduction_key"
+            camera:defaultValue="@string/pref_camera_redeyereduction_default"
+            camera:title="@string/pref_camera_redeyereduction_title"
+            camera:entries="@array/pref_camera_redeyereduction_entries"
+            camera:entryValues="@array/pref_camera_redeyereduction_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_selectablezoneaf_key"
+            camera:defaultValue="@string/pref_camera_selectablezoneaf_default"
+            camera:title="@string/pref_camera_selectablezoneaf_title"
+            camera:entries="@array/pref_camera_selectablezoneaf_entries"
+            camera:entryValues="@array/pref_camera_selectablezoneaf_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_zsl_key"
+            camera:defaultValue="@string/pref_camera_zsl_default"
+            camera:title="@string/pref_camera_zsl_title"
+            camera:entries="@array/pref_camera_zsl_entries"
+            camera:entryValues="@array/pref_camera_zsl_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_videosnapsize_key"
+            camera:title="@string/pref_camera_picturesize_title"
+            camera:defaultValue="@string/pref_camera_videosnapsize_default"
+            camera:entries="@array/pref_camera_picturesize_entries"
+            camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
 </PreferenceGroup>
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>