summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-09-20 02:31:09 +0300
committerMichael Bestas <mikeioannina@gmail.com>2015-09-20 20:02:05 +0300
commit71f4fae6ca8c12c467b5afa8a6d325fc10b77f45 (patch)
treec42a36b91e5236cffc1a6a35fddcb67a4c7d60f9 /res/values
parentde3e756185977708f1fdd6eb7fe669173d3d8316 (diff)
downloadandroid_packages_apps_Snap-71f4fae6ca8c12c467b5afa8a6d325fc10b77f45.tar.gz
android_packages_apps_Snap-71f4fae6ca8c12c467b5afa8a6d325fc10b77f45.tar.bz2
android_packages_apps_Snap-71f4fae6ca8c12c467b5afa8a6d325fc10b77f45.zip
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
Diffstat (limited to 'res/values')
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/qcomarrays.xml40
-rw-r--r--res/values/qcomstrings.xml13
3 files changed, 0 insertions, 55 deletions
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 -->