diff options
Diffstat (limited to 'res')
93 files changed, 520 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_scene_mode_hdr.png b/res/drawable-hdpi/ic_scene_mode_hdr.png Binary files differnew file mode 100644 index 000000000..d6b10af27 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_hdr.png diff --git a/res/drawable-hdpi/ic_ts_makeup_back.png b/res/drawable-hdpi/ic_ts_makeup_back.png Binary files differnew file mode 100644 index 000000000..7adc9bfe9 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_back.png diff --git a/res/drawable-hdpi/ic_ts_makeup_clean.png b/res/drawable-hdpi/ic_ts_makeup_clean.png Binary files differnew file mode 100644 index 000000000..1a7d4be21 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_clean.png diff --git a/res/drawable-hdpi/ic_ts_makeup_clean_selected.png b/res/drawable-hdpi/ic_ts_makeup_clean_selected.png Binary files differnew file mode 100644 index 000000000..1ead07d6d --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_clean_selected.png diff --git a/res/drawable-hdpi/ic_ts_makeup_custom.png b/res/drawable-hdpi/ic_ts_makeup_custom.png Binary files differnew file mode 100644 index 000000000..d818f9554 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_custom.png diff --git a/res/drawable-hdpi/ic_ts_makeup_custom_selected.png b/res/drawable-hdpi/ic_ts_makeup_custom_selected.png Binary files differnew file mode 100644 index 000000000..a3a5c04b5 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_custom_selected.png diff --git a/res/drawable-hdpi/ic_ts_makeup_level_1.png b/res/drawable-hdpi/ic_ts_makeup_level_1.png Binary files differnew file mode 100644 index 000000000..56de67f82 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_level_1.png diff --git a/res/drawable-hdpi/ic_ts_makeup_level_1_selected.png b/res/drawable-hdpi/ic_ts_makeup_level_1_selected.png Binary files differnew file mode 100644 index 000000000..85f989a7b --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_level_1_selected.png diff --git a/res/drawable-hdpi/ic_ts_makeup_level_2.png b/res/drawable-hdpi/ic_ts_makeup_level_2.png Binary files differnew file mode 100644 index 000000000..bac355cc8 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_level_2.png diff --git a/res/drawable-hdpi/ic_ts_makeup_level_2_selected.png b/res/drawable-hdpi/ic_ts_makeup_level_2_selected.png Binary files differnew file mode 100644 index 000000000..cf57d3415 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_level_2_selected.png diff --git a/res/drawable-hdpi/ic_ts_makeup_level_3.png b/res/drawable-hdpi/ic_ts_makeup_level_3.png Binary files differnew file mode 100644 index 000000000..9e04dd412 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_level_3.png diff --git a/res/drawable-hdpi/ic_ts_makeup_level_3_selected.png b/res/drawable-hdpi/ic_ts_makeup_level_3_selected.png Binary files differnew file mode 100644 index 000000000..3ca366cd9 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_level_3_selected.png diff --git a/res/drawable-hdpi/ic_ts_makeup_level_off.png b/res/drawable-hdpi/ic_ts_makeup_level_off.png Binary files differnew file mode 100644 index 000000000..9e7e67d80 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_level_off.png diff --git a/res/drawable-hdpi/ic_ts_makeup_level_off_selected.png b/res/drawable-hdpi/ic_ts_makeup_level_off_selected.png Binary files differnew file mode 100644 index 000000000..b7cc7d4f5 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_level_off_selected.png diff --git a/res/drawable-hdpi/ic_ts_makeup_off.png b/res/drawable-hdpi/ic_ts_makeup_off.png Binary files differnew file mode 100644 index 000000000..d2c0d94ef --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_off.png diff --git a/res/drawable-hdpi/ic_ts_makeup_on.png b/res/drawable-hdpi/ic_ts_makeup_on.png Binary files differnew file mode 100644 index 000000000..34d03b9dc --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_on.png diff --git a/res/drawable-hdpi/ic_ts_makeup_whiten.png b/res/drawable-hdpi/ic_ts_makeup_whiten.png Binary files differnew file mode 100644 index 000000000..90b35a9d9 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_whiten.png diff --git a/res/drawable-hdpi/ic_ts_makeup_whiten_selected.png b/res/drawable-hdpi/ic_ts_makeup_whiten_selected.png Binary files differnew file mode 100644 index 000000000..86da7f1d2 --- /dev/null +++ b/res/drawable-hdpi/ic_ts_makeup_whiten_selected.png diff --git a/res/drawable-mdpi/ic_scene_mode_hdr.png b/res/drawable-mdpi/ic_scene_mode_hdr.png Binary files differnew file mode 100644 index 000000000..caf4601ef --- /dev/null +++ b/res/drawable-mdpi/ic_scene_mode_hdr.png diff --git a/res/drawable-mdpi/ic_ts_makeup_back.png b/res/drawable-mdpi/ic_ts_makeup_back.png Binary files differnew file mode 100644 index 000000000..7cec89838 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_back.png diff --git a/res/drawable-mdpi/ic_ts_makeup_clean.png b/res/drawable-mdpi/ic_ts_makeup_clean.png Binary files differnew file mode 100644 index 000000000..2f65fb692 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_clean.png diff --git a/res/drawable-mdpi/ic_ts_makeup_clean_selected.png b/res/drawable-mdpi/ic_ts_makeup_clean_selected.png Binary files differnew file mode 100644 index 000000000..343e6049a --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_clean_selected.png diff --git a/res/drawable-mdpi/ic_ts_makeup_custom.png b/res/drawable-mdpi/ic_ts_makeup_custom.png Binary files differnew file mode 100644 index 000000000..adc1b55b9 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_custom.png diff --git a/res/drawable-mdpi/ic_ts_makeup_custom_selected.png b/res/drawable-mdpi/ic_ts_makeup_custom_selected.png Binary files differnew file mode 100644 index 000000000..c3d30baca --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_custom_selected.png diff --git a/res/drawable-mdpi/ic_ts_makeup_level_1.png b/res/drawable-mdpi/ic_ts_makeup_level_1.png Binary files differnew file mode 100644 index 000000000..5a6938519 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_level_1.png diff --git a/res/drawable-mdpi/ic_ts_makeup_level_1_selected.png b/res/drawable-mdpi/ic_ts_makeup_level_1_selected.png Binary files differnew file mode 100644 index 000000000..1cc0387cf --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_level_1_selected.png diff --git a/res/drawable-mdpi/ic_ts_makeup_level_2.png b/res/drawable-mdpi/ic_ts_makeup_level_2.png Binary files differnew file mode 100644 index 000000000..ac6fc9ec1 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_level_2.png diff --git a/res/drawable-mdpi/ic_ts_makeup_level_2_selected.png b/res/drawable-mdpi/ic_ts_makeup_level_2_selected.png Binary files differnew file mode 100644 index 000000000..b7dfb7307 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_level_2_selected.png diff --git a/res/drawable-mdpi/ic_ts_makeup_level_3.png b/res/drawable-mdpi/ic_ts_makeup_level_3.png Binary files differnew file mode 100644 index 000000000..5a777e41e --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_level_3.png diff --git a/res/drawable-mdpi/ic_ts_makeup_level_3_selected.png b/res/drawable-mdpi/ic_ts_makeup_level_3_selected.png Binary files differnew file mode 100644 index 000000000..9f154b22b --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_level_3_selected.png diff --git a/res/drawable-mdpi/ic_ts_makeup_level_off.png b/res/drawable-mdpi/ic_ts_makeup_level_off.png Binary files differnew file mode 100644 index 000000000..b08518a9d --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_level_off.png diff --git a/res/drawable-mdpi/ic_ts_makeup_level_off_selected.png b/res/drawable-mdpi/ic_ts_makeup_level_off_selected.png Binary files differnew file mode 100644 index 000000000..a77229f0d --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_level_off_selected.png diff --git a/res/drawable-mdpi/ic_ts_makeup_off.png b/res/drawable-mdpi/ic_ts_makeup_off.png Binary files differnew file mode 100644 index 000000000..08cdc12e9 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_off.png diff --git a/res/drawable-mdpi/ic_ts_makeup_on.png b/res/drawable-mdpi/ic_ts_makeup_on.png Binary files differnew file mode 100644 index 000000000..82d93f040 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_on.png diff --git a/res/drawable-mdpi/ic_ts_makeup_whiten.png b/res/drawable-mdpi/ic_ts_makeup_whiten.png Binary files differnew file mode 100644 index 000000000..5f9bb6681 --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_whiten.png diff --git a/res/drawable-mdpi/ic_ts_makeup_whiten_selected.png b/res/drawable-mdpi/ic_ts_makeup_whiten_selected.png Binary files differnew file mode 100644 index 000000000..69fe1ed6b --- /dev/null +++ b/res/drawable-mdpi/ic_ts_makeup_whiten_selected.png diff --git a/res/drawable-xhdpi/ic_scene_mode_hdr.png b/res/drawable-xhdpi/ic_scene_mode_hdr.png Binary files differnew file mode 100644 index 000000000..d24107512 --- /dev/null +++ b/res/drawable-xhdpi/ic_scene_mode_hdr.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_back.png b/res/drawable-xhdpi/ic_ts_makeup_back.png Binary files differnew file mode 100644 index 000000000..136963769 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_back.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_clean.png b/res/drawable-xhdpi/ic_ts_makeup_clean.png Binary files differnew file mode 100644 index 000000000..e223cd3af --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_clean.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_clean_selected.png b/res/drawable-xhdpi/ic_ts_makeup_clean_selected.png Binary files differnew file mode 100644 index 000000000..fe0184d60 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_clean_selected.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_custom.png b/res/drawable-xhdpi/ic_ts_makeup_custom.png Binary files differnew file mode 100644 index 000000000..6594b603d --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_custom.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_custom_selected.png b/res/drawable-xhdpi/ic_ts_makeup_custom_selected.png Binary files differnew file mode 100644 index 000000000..7845108d5 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_custom_selected.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_level_1.png b/res/drawable-xhdpi/ic_ts_makeup_level_1.png Binary files differnew file mode 100644 index 000000000..3aa4da0da --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_level_1.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_level_1_selected.png b/res/drawable-xhdpi/ic_ts_makeup_level_1_selected.png Binary files differnew file mode 100644 index 000000000..b10aae7e4 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_level_1_selected.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_level_2.png b/res/drawable-xhdpi/ic_ts_makeup_level_2.png Binary files differnew file mode 100644 index 000000000..92e6bd73a --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_level_2.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_level_2_selected.png b/res/drawable-xhdpi/ic_ts_makeup_level_2_selected.png Binary files differnew file mode 100644 index 000000000..edda58623 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_level_2_selected.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_level_3.png b/res/drawable-xhdpi/ic_ts_makeup_level_3.png Binary files differnew file mode 100644 index 000000000..ad2920908 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_level_3.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_level_3_selected.png b/res/drawable-xhdpi/ic_ts_makeup_level_3_selected.png Binary files differnew file mode 100644 index 000000000..8c043a25e --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_level_3_selected.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_level_off.png b/res/drawable-xhdpi/ic_ts_makeup_level_off.png Binary files differnew file mode 100644 index 000000000..7ecb29e6a --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_level_off.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_level_off_selected.png b/res/drawable-xhdpi/ic_ts_makeup_level_off_selected.png Binary files differnew file mode 100644 index 000000000..47ade00c5 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_level_off_selected.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_off.png b/res/drawable-xhdpi/ic_ts_makeup_off.png Binary files differnew file mode 100644 index 000000000..2de9d8ac8 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_off.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_on.png b/res/drawable-xhdpi/ic_ts_makeup_on.png Binary files differnew file mode 100644 index 000000000..2178ebf99 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_on.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_whiten.png b/res/drawable-xhdpi/ic_ts_makeup_whiten.png Binary files differnew file mode 100644 index 000000000..6f2520402 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_whiten.png diff --git a/res/drawable-xhdpi/ic_ts_makeup_whiten_selected.png b/res/drawable-xhdpi/ic_ts_makeup_whiten_selected.png Binary files differnew file mode 100644 index 000000000..1b84f9f10 --- /dev/null +++ b/res/drawable-xhdpi/ic_ts_makeup_whiten_selected.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_back.png b/res/drawable-xxhdpi/ic_ts_makeup_back.png Binary files differnew file mode 100644 index 000000000..5214f0e1e --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_back.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_clean.png b/res/drawable-xxhdpi/ic_ts_makeup_clean.png Binary files differnew file mode 100644 index 000000000..5eeea1856 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_clean.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_clean_selected.png b/res/drawable-xxhdpi/ic_ts_makeup_clean_selected.png Binary files differnew file mode 100644 index 000000000..f3ff4c8d2 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_clean_selected.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_custom.png b/res/drawable-xxhdpi/ic_ts_makeup_custom.png Binary files differnew file mode 100644 index 000000000..e395f61ab --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_custom.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_custom_selected.png b/res/drawable-xxhdpi/ic_ts_makeup_custom_selected.png Binary files differnew file mode 100644 index 000000000..fa24b494a --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_custom_selected.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_level_1.png b/res/drawable-xxhdpi/ic_ts_makeup_level_1.png Binary files differnew file mode 100644 index 000000000..757c32359 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_level_1.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_level_1_selected.png b/res/drawable-xxhdpi/ic_ts_makeup_level_1_selected.png Binary files differnew file mode 100644 index 000000000..15f500a5a --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_level_1_selected.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_level_2.png b/res/drawable-xxhdpi/ic_ts_makeup_level_2.png Binary files differnew file mode 100644 index 000000000..dd43b4b48 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_level_2.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_level_2_selected.png b/res/drawable-xxhdpi/ic_ts_makeup_level_2_selected.png Binary files differnew file mode 100644 index 000000000..74ca84de0 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_level_2_selected.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_level_3.png b/res/drawable-xxhdpi/ic_ts_makeup_level_3.png Binary files differnew file mode 100644 index 000000000..37aaedb0b --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_level_3.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_level_3_selected.png b/res/drawable-xxhdpi/ic_ts_makeup_level_3_selected.png Binary files differnew file mode 100644 index 000000000..fe701e70c --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_level_3_selected.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_level_off.png b/res/drawable-xxhdpi/ic_ts_makeup_level_off.png Binary files differnew file mode 100644 index 000000000..b72a87614 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_level_off.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_level_off_selected.png b/res/drawable-xxhdpi/ic_ts_makeup_level_off_selected.png Binary files differnew file mode 100644 index 000000000..bb9a78371 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_level_off_selected.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_off.png b/res/drawable-xxhdpi/ic_ts_makeup_off.png Binary files differnew file mode 100644 index 000000000..0455b1c05 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_off.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_on.png b/res/drawable-xxhdpi/ic_ts_makeup_on.png Binary files differnew file mode 100644 index 000000000..95d7cbf5a --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_on.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_whiten.png b/res/drawable-xxhdpi/ic_ts_makeup_whiten.png Binary files differnew file mode 100644 index 000000000..1b31ab9dd --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_whiten.png diff --git a/res/drawable-xxhdpi/ic_ts_makeup_whiten_selected.png b/res/drawable-xxhdpi/ic_ts_makeup_whiten_selected.png Binary files differnew file mode 100644 index 000000000..a6ff05f96 --- /dev/null +++ b/res/drawable-xxhdpi/ic_ts_makeup_whiten_selected.png diff --git a/res/drawable/ic_ts_makeup_bg.9.png b/res/drawable/ic_ts_makeup_bg.9.png Binary files differnew file mode 100644 index 000000000..57f75a27b --- /dev/null +++ b/res/drawable/ic_ts_makeup_bg.9.png diff --git a/res/drawable/ic_ts_makeup_clean_selector.xml b/res/drawable/ic_ts_makeup_clean_selector.xml new file mode 100644 index 000000000..791658dd4 --- /dev/null +++ b/res/drawable/ic_ts_makeup_clean_selector.xml @@ -0,0 +1,22 @@ +<?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 new file mode 100644 index 000000000..eecc2c7ce --- /dev/null +++ b/res/drawable/ic_ts_makeup_custom_selector.xml @@ -0,0 +1,22 @@ +<?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_hline.png b/res/drawable/ic_ts_makeup_hline.png Binary files differnew file mode 100644 index 000000000..110ad7150 --- /dev/null +++ b/res/drawable/ic_ts_makeup_hline.png diff --git a/res/drawable/ic_ts_makeup_level_1_selector.xml b/res/drawable/ic_ts_makeup_level_1_selector.xml new file mode 100644 index 000000000..38e9193ab --- /dev/null +++ b/res/drawable/ic_ts_makeup_level_1_selector.xml @@ -0,0 +1,22 @@ +<?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 new file mode 100644 index 000000000..76d40bd88 --- /dev/null +++ b/res/drawable/ic_ts_makeup_level_2_selector.xml @@ -0,0 +1,22 @@ +<?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 new file mode 100644 index 000000000..e26ecdfa5 --- /dev/null +++ b/res/drawable/ic_ts_makeup_level_3_selector.xml @@ -0,0 +1,22 @@ +<?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 new file mode 100644 index 000000000..e1939673a --- /dev/null +++ b/res/drawable/ic_ts_makeup_level_off_selector.xml @@ -0,0 +1,22 @@ +<?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_vline.png b/res/drawable/ic_ts_makeup_vline.png Binary files differnew file mode 100644 index 000000000..89c722c93 --- /dev/null +++ b/res/drawable/ic_ts_makeup_vline.png diff --git a/res/drawable/ic_ts_makeup_whiten_selector.xml b/res/drawable/ic_ts_makeup_whiten_selector.xml new file mode 100644 index 000000000..f1284b604 --- /dev/null +++ b/res/drawable/ic_ts_makeup_whiten_selector.xml @@ -0,0 +1,22 @@ +<?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 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/layout/ts_makeup_item_view.xml b/res/layout/ts_makeup_item_view.xml new file mode 100644 index 000000000..4b5a050cf --- /dev/null +++ b/res/layout/ts_makeup_item_view.xml @@ -0,0 +1,52 @@ +<?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 new file mode 100644 index 000000000..0d02562ff --- /dev/null +++ b/res/layout/ts_makeup_level_view_land.xml @@ -0,0 +1,29 @@ +<?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 new file mode 100644 index 000000000..4ffaba5dd --- /dev/null +++ b/res/layout/ts_makeup_level_view_port.xml @@ -0,0 +1,29 @@ +<?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 new file mode 100644 index 000000000..fbfafeec3 --- /dev/null +++ b/res/layout/ts_makeup_single_level_view_port.xml @@ -0,0 +1,154 @@ +<?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 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/arrays.xml b/res/values/arrays.xml index 5ee0c7720..208c3257d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -397,6 +397,7 @@ <!-- Camera Preferences Scene Mode dialog box entries --> <string-array name="pref_camera_scenemode_entries" translatable="false"> <item>@string/pref_camera_scenemode_entry_auto</item> + <item>@string/pref_camera_scenemode_entry_hdr</item> <item>@string/pref_camera_scenemode_entry_refocus</item> <item>@string/pref_camera_scenemode_entry_portrait</item> <item>@string/pref_camera_scenemode_entry_landscape</item> @@ -412,6 +413,7 @@ <array name="scenemode_thumbnails" translatable="false"> <item>@drawable/ic_scene_mode_auto</item> + <item>@drawable/ic_scene_mode_hdr</item> <item>@drawable/ic_scene_mode_refocus</item> <item>@drawable/ic_scene_mode_portrait</item> <item>@drawable/ic_scene_mode_landscape</item> @@ -443,7 +445,7 @@ <string-array name="pref_camera_scenemode_entryvalues" translatable="false"> <item>auto</item> - + <item>hdr</item> <item>@string/pref_camera_advanced_feature_value_refocus_on</item> <item>portrait</item> <item>landscape</item> 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 23ba3d382..ca6ddc2e8 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -767,6 +767,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 c7d8df589..a2b6b7231 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -868,6 +868,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" |
