Snap: Remove CAF beautification feature

Revert "SnapdragonCamera: Move the files to the correct location"

This reverts commit c25b2d510285512dbb60547353190433f1dbb984.

Revert "SnapdragonCamera: Add beautification feature to SnapdragonCamera."

This reverts commit c1cea7c15b2e463f37c17f2a4ce61ce689ec7088.

Change-Id: If01e4f438a58e4210a3eddf090d426895ecbae87

18 files changed, 0 insertions, 519 deletions

diff --git a/res/drawable/ic_ts_makeup_clean_selector.xml b/res/drawable/ic_ts_makeup_clean_selector.xml
deleted file mode 100644
index 791658dd4..000000000
--- a/res/drawable/ic_ts_makeup_clean_selector.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_clean_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_clean" />
-</selector>
diff --git a/res/drawable/ic_ts_makeup_custom_selector.xml b/res/drawable/ic_ts_makeup_custom_selector.xml
deleted file mode 100644
index eecc2c7ce..000000000
--- a/res/drawable/ic_ts_makeup_custom_selector.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_custom_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_custom" />
-</selector>
diff --git a/res/drawable/ic_ts_makeup_level_1_selector.xml b/res/drawable/ic_ts_makeup_level_1_selector.xml
deleted file mode 100644
index 38e9193ab..000000000
--- a/res/drawable/ic_ts_makeup_level_1_selector.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_1_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_level_1" />
-</selector>
diff --git a/res/drawable/ic_ts_makeup_level_2_selector.xml b/res/drawable/ic_ts_makeup_level_2_selector.xml
deleted file mode 100644
index 76d40bd88..000000000
--- a/res/drawable/ic_ts_makeup_level_2_selector.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_2_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_level_2" />
-</selector>
diff --git a/res/drawable/ic_ts_makeup_level_3_selector.xml b/res/drawable/ic_ts_makeup_level_3_selector.xml
deleted file mode 100644
index e26ecdfa5..000000000
--- a/res/drawable/ic_ts_makeup_level_3_selector.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_3_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_level_3" />
-</selector>
diff --git a/res/drawable/ic_ts_makeup_level_off_selector.xml b/res/drawable/ic_ts_makeup_level_off_selector.xml
deleted file mode 100644
index e1939673a..000000000
--- a/res/drawable/ic_ts_makeup_level_off_selector.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_off_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_level_off" />
-</selector>
diff --git a/res/drawable/ic_ts_makeup_whiten_selector.xml b/res/drawable/ic_ts_makeup_whiten_selector.xml
deleted file mode 100644
index f1284b604..000000000
--- a/res/drawable/ic_ts_makeup_whiten_selector.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_whiten_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_whiten" />
-</selector>
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index af47a13b6..bc85432d9 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -83,10 +83,6 @@
         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 105a8c9d4..178359296 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -89,10 +89,4 @@
     <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/layout/ts_makeup_item_view.xml b/res/layout/ts_makeup_item_view.xml
deleted file mode 100644
index 4b5a050cf..000000000
--- a/res/layout/ts_makeup_item_view.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:gravity="center"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/border"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical" >
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="48dip"
-            android:layout_height="48dip"
-            android:layout_gravity="center"
-            android:gravity="center" />
-
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            android:textStyle="bold" />
-    </LinearLayout>
-
-</com.android.camera.ui.RotateLayout>
\ No newline at end of file
diff --git a/res/layout/ts_makeup_level_view_land.xml b/res/layout/ts_makeup_level_view_land.xml
deleted file mode 100644
index 0d02562ff..000000000
--- a/res/layout/ts_makeup_level_view_land.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/id_makeup_level_root"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:layout_gravity="right"
-    android:layout_alignParentRight="true"
-    android:alpha="0.85"
-    android:orientation="vertical" >
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/ts_makeup_level_view_port.xml b/res/layout/ts_makeup_level_view_port.xml
deleted file mode 100644
index 4ffaba5dd..000000000
--- a/res/layout/ts_makeup_level_view_port.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/id_makeup_level_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:layout_alignParentBottom="true"
-    android:alpha="0.85"
-    android:orientation="horizontal" >
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/ts_makeup_single_level_view_port.xml b/res/layout/ts_makeup_single_level_view_port.xml
deleted file mode 100644
index fbfafeec3..000000000
--- a/res/layout/ts_makeup_single_level_view_port.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/id_makeup_single_level_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:layout_gravity="bottom"
-    android:orientation="vertical" >
-
-    <SeekBar
-        android:id="@+id/seekbar_makeup_level"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dip"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/tsmakeup_mode_level_size"
-        android:layout_gravity="center"
-        android:gravity="center" >
-
-        <LinearLayout
-            android:id="@+id/id_layout_makeup_back"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_weight="2.0"
-            android:gravity="center" >
-
-            <ImageView
-                android:id="@+id/id_iv_makeup_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_ts_makeup_back" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_weight="1.0"
-            android:gravity="center" >
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="36dip"
-                android:layout_gravity="center"
-                android:background="@drawable/ic_ts_makeup_vline" />
-        </LinearLayout>
-
-        <com.android.camera.ui.RotateLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_weight="3.5"
-            android:gravity="center"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:id="@+id/id_layout_makeup_clean"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:padding="2dip" >
-
-                <ImageView
-                    android:id="@+id/id_iv_makeup_clean"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_ts_makeup_clean_selector" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:shadowColor="@android:color/black"
-                    android:shadowDx="1"
-                    android:shadowDy="1"
-                    android:shadowRadius="2"
-                    android:singleLine="true"
-                    android:text="@string/pref_camera_tsmakeup_level_clean"
-                    android:textColor="@android:color/white"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
-            </LinearLayout>
-        </com.android.camera.ui.RotateLayout>
-
-        <com.android.camera.ui.RotateLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_weight="3.5"
-            android:gravity="center"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:id="@+id/id_layout_makeup_whiten"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:padding="2dp" >
-
-                <ImageView
-                    android:id="@+id/id_iv_makeup_whiten"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_ts_makeup_whiten_selector" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:shadowColor="@android:color/black"
-                    android:shadowDx="1"
-                    android:shadowDy="1"
-                    android:shadowRadius="2"
-                    android:singleLine="true"
-                    android:text="@string/pref_camera_tsmakeup_level_whiten"
-                    android:textColor="@android:color/white"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
-            </LinearLayout>
-        </com.android.camera.ui.RotateLayout>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 47bc62f25..ba9a5ec06 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -529,15 +529,4 @@
     <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 1ba60c825..64e55adc7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -167,8 +167,6 @@
     <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 821250c6c..265be963d 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -818,44 +818,4 @@
         <item>0</item>
         <item>1</item>
     </string-array>
-
-    <!-- Beautification -->
-    <string-array name="pref_camera_tsmakeup_entries" translatable="false">
-        <item>@string/setting_off</item>
-        <item>@string/setting_on</item>
-    </string-array>
-
-    <string-array name="pref_camera_tsmakeup_entryvalues" translatable="false">
-        <item>Off</item>
-        <item>On</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>
-
-    <string-array name="pref_camera_tsmakeup_level_entries" translatable="false">
-        <item>@string/setting_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>
 </resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 61628a478..25a9cdc7d 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -442,19 +442,6 @@
     <string name="pref_camera_savepath_entry_0">Internal storage</string>
     <string name="pref_camera_savepath_entry_1">SD card</string>
 
-    <!-- Beautification -->
-    <string name="pref_camera_tsmakeup_title">Beautification</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_msg">To use beautification, face detection must be disabled</string>
-    <string name="text_tsmakeup_alert_continue">Continue</string>
-    <string name="text_tsmakeup_alert_quit">Cancel</string>
-
     <!-- Misc -->
 
     <!-- The alias of CameraActivity for gesture operation -->
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 32fd0a472..54d72424d 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -231,31 +231,6 @@
             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"