diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2015-09-20 02:31:09 +0300 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-20 20:02:05 +0300 |
commit | 71f4fae6ca8c12c467b5afa8a6d325fc10b77f45 (patch) | |
tree | c42a36b91e5236cffc1a6a35fddcb67a4c7d60f9 /res/layout | |
parent | de3e756185977708f1fdd6eb7fe669173d3d8316 (diff) | |
download | android_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/layout')
-rw-r--r-- | res/layout/photo_module.xml | 6 | ||||
-rw-r--r-- | res/layout/ts_makeup_item_view.xml | 52 | ||||
-rw-r--r-- | res/layout/ts_makeup_level_view_land.xml | 29 | ||||
-rw-r--r-- | res/layout/ts_makeup_level_view_port.xml | 29 | ||||
-rw-r--r-- | res/layout/ts_makeup_single_level_view_port.xml | 154 |
5 files changed, 0 insertions, 270 deletions
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 |