SnapdragonCamera: Add beautification feature to SnapdragonCamera.

Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530

7 files changed, 99 insertions, 0 deletions

diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index bc85432d9..af47a13b6 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -83,6 +83,10 @@
         android:id="@+id/filter_mode_switcher"
         style="@style/ToggleButton" />
 
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/ts_makeup_switcher"
+        style="@style/ToggleButton" />
+
     <LinearLayout
         android:id="@+id/remaining_photos"
         android:layout_width="wrap_content"
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index c6d895771..e0aaa147f 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -99,4 +99,10 @@
     <include layout="@layout/camera_controls"
         android:layout_gravity="center"
         style="@style/CameraControls"/>
+
+    <RelativeLayout
+        android:id="@+id/id_tsmakeup_level_layout_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
 </merge>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e248a4523..af9fdfada 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -529,4 +529,15 @@
     <string name="camera_gesture_title">打开相机</string>
 
     <string name="remaining_photos_format">剩余 %d 张</string>
+    <string name="pref_camera_tsmakeup_title">美颜</string>
+    <string name="pref_camera_tsmakeup_entry_on">开</string>
+    <string name="pref_camera_tsmakeup_entry_off">关</string>
+    <string name="pref_camera_tsmakeup_custom">自定义</string>
+    <string name="pref_camera_tsmakeup_level_whiten">美白</string>
+    <string name="pref_camera_tsmakeup_level_clean">磨皮</string>
+    <string name="text_tsmakeup_alert_title">警告</string>
+    <string name="text_tsmakeup_alert_msg">实时美颜需要开启人脸检测功能，是否开启？</string>
+    <string name="text_tsmakeup_alert_continue">继续</string>
+    <string name="text_tsmakeup_alert_quit">退出</string>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 64e55adc7..1ba60c825 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -167,6 +167,8 @@
     <dimen name="filter_mode_padding">10dp</dimen>
 
     <dimen name="remaining_photos_margin">67dp</dimen>
+    <dimen name="tsmakeup_mode_paddingBottom">96dp</dimen>
+    <dimen name="tsmakeup_mode_level_size">96dp</dimen>
 
     <!-- Margins for 4:3 preview on 16:9 screen with 640dp height -->
     <dimen name="preview_top_margin">57dp</dimen>
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 96db5ea49..99c4337fd 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -769,6 +769,45 @@
         <item>@string/pref_hdr_need_1x_value_false</item>
         <item>@string/pref_hdr_need_1x_value_true</item>
     </string-array>
+        <string-array name="pref_camera_tsmakeup_entries">
+        <item>@string/pref_camera_tsmakeup_entry_off</item>
+        <item>@string/pref_camera_tsmakeup_entry_on</item>
+    </string-array>
+
+    <!-- Do not localize entryvalues -->
+    <string-array name="pref_camera_tsmakeup_entryvalues">
+        <item>Off</item>
+        <item>On</item>
+    </string-array>
+
+    <!-- Camera Preferences Color effect dialog box entries -->
+    <string-array name="pref_camera_tsmakeup_level_entries" translatable="false">
+        <item>@string/pref_camera_tsmakeup_entry_off</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>@string/pref_camera_tsmakeup_custom</item>
+    </string-array>
+
+    <array name="tsmakeup_level_thumbnails" translatable="false">
+        <item>@drawable/ic_ts_makeup_level_off_selector</item>
+        <item>@drawable/ic_ts_makeup_level_1_selector</item>
+        <item>@drawable/ic_ts_makeup_level_2_selector</item>
+        <item>@drawable/ic_ts_makeup_level_3_selector</item>
+        <item>@drawable/ic_ts_makeup_custom_selector</item>
+    </array>
+
+    <string-array name="pref_camera_tsmakeup_level_entryvalues" translatable="false">
+        <item>@string/pref_camera_tsmakeup_default</item>
+        <item>20</item>
+        <item>60</item>
+        <item>100</item>
+        <item>none</item>
+    </string-array>
+    <string-array name="pref_ts_makeup_icons" translatable="false">
+        <item>@drawable/ic_ts_makeup_off</item>
+        <item>@drawable/ic_ts_makeup_on</item>
+    </string-array>
 
 </resources>
 
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index ca50da013..5bab9841b 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -872,6 +872,18 @@
 
     <!-- The alas of CameraActivity for gesture operation -->
     <string name="camera_gesture_title">Launch camera</string>
+     <string name="pref_camera_tsmakeup_title">Beautification</string>
+     <string name="pref_camera_tsmakeup_entry_on">On</string>
+     <string name="pref_camera_tsmakeup_entry_off">Off</string>
+     <string name="pref_camera_tsmakeup_default" translatable="false">Off</string>
+     <string name="pref_camera_tsmakeup_level_default" translatable="false">60</string>
+     <string name="pref_camera_tsmakeup_custom">Custom</string>
+     <string name="pref_camera_tsmakeup_level_whiten">Whiten</string>
+     <string name="pref_camera_tsmakeup_level_clean">Soften</string>
+     <string name="text_tsmakeup_alert_title">Warning</string>
+     <string name="text_tsmakeup_alert_msg">The beautification must turn on Face Detection, Continue or Quit?</string>
+     <string name="text_tsmakeup_alert_continue">Continue</string>
+     <string name="text_tsmakeup_alert_quit">Quit</string>
 
     <string name="all_in_focus">All in Focus</string>
 </resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index c9008c3a7..6fc88a35f 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -231,6 +231,31 @@
             camera:singleIcon="@drawable/ic_settings_facerec"
             camera:entryValues="@array/pref_camera_facedetection_entryvalues" />
     <IconListPreference
+            camera:key="pref_camera_tsmakeup_key"
+            camera:defaultValue="@string/pref_camera_tsmakeup_default"
+            camera:title="@string/pref_camera_tsmakeup_title"
+            camera:entries="@array/pref_camera_tsmakeup_entries"
+            camera:singleIcon="@drawable/ic_ts_makeup_off"
+            camera:icons="@array/pref_ts_makeup_icons"
+            camera:largeIcons="@array/pref_ts_makeup_icons"
+            camera:entryValues="@array/pref_camera_tsmakeup_entryvalues" />
+    <IconListPreference
+            camera:key="pref_camera_tsmakeup_level_key"
+            camera:defaultValue="@string/pref_camera_tsmakeup_default"
+            camera:title="@string/pref_camera_tsmakeup_title"
+            camera:entries="@array/pref_camera_tsmakeup_level_entries"
+            camera:thumbnails="@array/tsmakeup_level_thumbnails"
+            camera:singleIcon="@drawable/ic_ts_makeup_off"
+            camera:entryValues="@array/pref_camera_tsmakeup_level_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_tsmakeup_whiten"
+            camera:defaultValue="@string/pref_camera_tsmakeup_level_default"
+            camera:title="@string/pref_camera_tsmakeup_title" />
+    <ListPreference
+            camera:key="pref_camera_tsmakeup_clean"
+            camera:defaultValue="@string/pref_camera_tsmakeup_level_default"
+            camera:title="@string/pref_camera_tsmakeup_title" />
+    <IconListPreference
             camera:key="pref_camera_redeyereduction_key"
             camera:defaultValue="@string/pref_camera_redeyereduction_default"
             camera:title="@string/pref_camera_redeyereduction_title"