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)

4 files changed, 233 insertions, 3 deletions

diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index b63d53662..78cf72a81 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -24,6 +24,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center">
+    <include layout="@layout/count_down_to_capture"/>
     <!-- Wrap a frame layout around texture view so that when scaled, texture
          view will not draw outside its unscaled bounds -->
     <FrameLayout
@@ -33,7 +34,67 @@
             android:id="@+id/preview_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
+       <RelativeLayout android:id="@+id/linear"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <ProgressBar
+                style="?android:attr/progressBarStyleHorizontal"
+                android:id="@+id/progress"
+                android:orientation="vertical"
+                android:layout_width="200dip"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dip"
+                android:layout_marginBottom="14dip"
+                android:layout_marginLeft="30dip"
+                android:layout_marginRight="30dip" />
+            <TableLayout
+                android:id="@+id/relative_seek"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="20px"
+                android:layout_marginRight="20px"
+                android:layout_marginLeft="20px"
+                android:stretchColumns="1">
+                <TableRow> <TextView
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/skintonetitle"
+                    android:layout_gravity="center"
+                    android:textSize="22.0sp"
+                    android:textStyle="bold" />
+                </TableRow>
+                <TableRow> <SeekBar
+                    android:id="@+id/skintoneseek"
+                    android:layout_below="@+id/skintonetitle"
+                    android:layout_width="400px"
+                    android:layout_height="33dip"
+                    android:layout_marginLeft="25px"
+                    android:layout_marginTop="2dip"/>
+                </TableRow>
+                <TableRow>
+                    <TextView
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/skintoneleft"
+                        android:textSize="22.0sp"
+                        android:textStyle="bold" />
+                    <TextView
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/skintoneright"
+                        android:textSize="22.0sp"
+                        android:textStyle="bold"/>
+                </TableRow>
+            </TableLayout>
+        </RelativeLayout>
     </FrameLayout>
+    <com.android.camera.GraphView
+        android:id="@+id/graph_view"
+        android:layout_width="200dip"
+        android:layout_height="200dip"
+        android:layout_marginTop="15dip"
+        android:layout_marginLeft="15dip" />
     <ImageView
         android:id="@+id/review_image"
         android:layout_width="match_parent"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 02ece7733..621f1c996 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -381,6 +381,20 @@
         <item>@string/pref_camera_scenemode_entry_auto</item>
         <item>@string/pref_camera_scenemode_entry_sunset</item>
         <item>@string/pref_camera_scenemode_entry_party</item>
+        <item>@string/pref_camera_scenemode_entry_asd</item>
+        <item>@string/pref_camera_scenemode_entry_portrait</item>
+        <item>@string/pref_camera_scenemode_entry_landscape</item>
+        <item>@string/pref_camera_scenemode_entry_night_portrait</item>
+        <item>@string/pref_camera_scenemode_entry_theatre</item>
+        <item>@string/pref_camera_scenemode_entry_beach</item>
+        <item>@string/pref_camera_scenemode_entry_snow</item>
+        <item>@string/pref_camera_scenemode_entry_steadyphoto</item>
+        <item>@string/pref_camera_scenemode_entry_fireworks</item>
+        <item>@string/pref_camera_scenemode_entry_sports</item>
+        <item>@string/pref_camera_scenemode_entry_candlelight</item>
+        <item>@string/pref_camera_scenemode_entry_backlight</item>
+        <item>@string/pref_camera_scenemode_entry_flowers</item>
+        <item>@string/pref_camera_scenemode_entry_ar</item>
     </string-array>
 
     <string-array name="pref_camera_scenemode_labels">
@@ -405,6 +419,20 @@
         <item>auto</item>
         <item>sunset</item>
         <item>party</item>
+        <item>asd</item>
+        <item>portrait</item>
+        <item>landscape</item>
+        <item>night-portrait</item>
+        <item>theatre</item>
+        <item>beach</item>
+        <item>snow</item>
+        <item>steadyphoto</item>
+        <item>fireworks</item>
+        <item>sports</item>
+        <item>candlelight</item>
+        <item>backlight</item>
+        <item>flowers</item>
+        <item>AR</item>
     </string-array>
 
     <array name="camera_id_entries" translatable="false">
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>