DO NOT MERGE Further assets clean up.

Remove unused assets and layouts.

bug:8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5

diff --git a/res/drawable-hdpi/background_portrait.jpg b/res/drawable-hdpi/background_portrait.jpg
deleted file mode 100644 (file)
index 75309b4..0000000
Binary files a/res/drawable-hdpi/background_portrait.jpg and /dev/null differ

diff --git a/res/drawable-mdpi/background_portrait.jpg b/res/drawable-mdpi/background_portrait.jpg
deleted file mode 100644 (file)
index 75309b4..0000000
Binary files a/res/drawable-mdpi/background_portrait.jpg and /dev/null differ

diff --git a/res/drawable/filtershow_border_film.png b/res/drawable/filtershow_border_film.png
deleted file mode 100755 (executable)
index 9fbd637..0000000
Binary files a/res/drawable/filtershow_border_film.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_border.png b/res/drawable/filtershow_button_border.png
deleted file mode 100644 (file)
index 69195a9..0000000
Binary files a/res/drawable/filtershow_button_border.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_colors_contrast.png b/res/drawable/filtershow_button_colors_contrast.png
deleted file mode 100644 (file)
index ccb2dc6..0000000
Binary files a/res/drawable/filtershow_button_colors_contrast.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_colors_vignette.png b/res/drawable/filtershow_button_colors_vignette.png
deleted file mode 100644 (file)
index ac3d53f..0000000
Binary files a/res/drawable/filtershow_button_colors_vignette.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_current.png b/res/drawable/filtershow_button_current.png
deleted file mode 100644 (file)
index 8c4b379..0000000
Binary files a/res/drawable/filtershow_button_current.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_fx.png b/res/drawable/filtershow_button_fx.png
deleted file mode 100644 (file)
index c887fe4..0000000
Binary files a/res/drawable/filtershow_button_fx.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_operations.png b/res/drawable/filtershow_button_operations.png
deleted file mode 100644 (file)
index 79e9a44..0000000
Binary files a/res/drawable/filtershow_button_operations.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_origin.png b/res/drawable/filtershow_button_origin.png
deleted file mode 100644 (file)
index 0cd0bc2..0000000
Binary files a/res/drawable/filtershow_button_origin.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_settings.png b/res/drawable/filtershow_button_settings.png
deleted file mode 100644 (file)
index df3925a..0000000
Binary files a/res/drawable/filtershow_button_settings.png and /dev/null differ

diff --git a/res/drawable/filtershow_button_show_original.png b/res/drawable/filtershow_button_show_original.png
deleted file mode 100644 (file)
index 925954b..0000000
Binary files a/res/drawable/filtershow_button_show_original.png and /dev/null differ

diff --git a/res/drawable/filtershow_delpoint.png b/res/drawable/filtershow_delpoint.png
deleted file mode 100644 (file)
index 84f2e5b..0000000
Binary files a/res/drawable/filtershow_delpoint.png and /dev/null differ

diff --git a/res/layout/cropimage.xml b/res/layout/cropimage.xml
deleted file mode 100644 (file)
index c434fb6..0000000
--- a/res/layout/cropimage.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <include layout="@layout/gl_root_group"/>
-</FrameLayout>

diff --git a/res/layout/filtershow_category_panel.xml b/res/layout/filtershow_category_panel.xml
deleted file mode 100644 (file)
index c1b8bbe..0000000
--- a/res/layout/filtershow_category_panel.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     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"
-    android:layout_width="match_parent"
-    android:layout_height="48dip"
-    android:background="@color/background_main_toolbar" >
-
-    <ImageButton
-        android:id="@+id/fxButton"
-        android:layout_width="@dimen/thumbnail_size"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="@drawable/filtershow_button_background"
-        android:scaleType="centerInside"
-        android:src="@drawable/ic_photoeditor_effects" />
-
-    <ImageButton
-        android:id="@+id/borderButton"
-        android:layout_width="@dimen/thumbnail_size"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="@drawable/filtershow_button_background"
-        android:padding="2dip"
-        android:scaleType="centerInside"
-        android:src="@drawable/ic_photoeditor_border" />
-
-    <ImageButton
-        android:id="@+id/geometryButton"
-        android:layout_width="@dimen/thumbnail_size"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="@drawable/filtershow_button_background"
-        android:padding="2dip"
-        android:scaleType="centerInside"
-        android:src="@drawable/ic_photoeditor_fix" />
-
-    <ImageButton
-        android:id="@+id/colorsButton"
-        android:layout_width="@dimen/thumbnail_size"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="@drawable/filtershow_button_background"
-        android:padding="2dip"
-        android:scaleType="centerInside"
-        android:src="@drawable/ic_photoeditor_color" />
-
-</LinearLayout>
\ No newline at end of file

diff --git a/res/layout/filtershow_cp_custom_title.xml b/res/layout/filtershow_cp_custom_title.xml
deleted file mode 100644 (file)
index cef8b6c..0000000
--- a/res/layout/filtershow_cp_custom_title.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     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.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/customTitle"
-    android:text="@string/color_pick_title"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:layout_marginLeft="20dp"
-    android:layout_marginRight="20dp" >
-</TextView>
\ No newline at end of file

diff --git a/res/layout/filtershow_crop_button.xml b/res/layout/filtershow_crop_button.xml
deleted file mode 100644 (file)
index b42d6b6..0000000
--- a/res/layout/filtershow_crop_button.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     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.gallery3d.filtershow.ui.FramedTextButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/cropUtilityButton"
-    android:layout_width="84dip"
-    android:layout_height="84dip"
-    android:layout_gravity="center_vertical|left"
-    android:background="@drawable/filtershow_button_background"
-    android:scaleType="centerInside"
-    android:visibility="gone"
-    android:text="@string/aspectNone_effect" />
\ No newline at end of file

diff --git a/res/layout/filtershow_curves_button.xml b/res/layout/filtershow_curves_button.xml
deleted file mode 100644 (file)
index 31e8aed..0000000
--- a/res/layout/filtershow_curves_button.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     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.gallery3d.filtershow.ui.FramedTextButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/curvesUtilityButton"
-    android:layout_width="84dip"
-    android:layout_height="84dip"
-    android:layout_gravity="center_vertical|left"
-    android:background="@drawable/filtershow_button_background"
-    android:scaleType="centerInside"
-    android:visibility="gone"
-    android:text="@string/curves_channel_rgb" />

diff --git a/res/layout/filtershow_draw_button.xml b/res/layout/filtershow_draw_button.xml
deleted file mode 100644 (file)
index dba8100..0000000
--- a/res/layout/filtershow_draw_button.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     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.gallery3d.filtershow.ui.FramedTextButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawUtilityButton"
-    android:layout_width="84dip"
-    android:layout_height="84dip"
-    android:layout_gravity="center_vertical|left"
-    android:background="@drawable/filtershow_button_background"
-    android:scaleType="centerInside"
-    android:visibility="gone"
-    android:text="@string/draw_style" />

diff --git a/res/layout/filtershow_history_panel.xml b/res/layout/filtershow_history_panel.xml
deleted file mode 100644 (file)
index 392e39c..0000000
--- a/res/layout/filtershow_history_panel.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     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"
-        android:id="@+id/historyPanel"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:layout_weight="1"
-        android:visibility="gone" >
-
-    <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:gravity="center"
-            android:padding="2dip"
-            android:text="@string/history"
-            android:textColor="@android:color/white"
-            android:textSize="24sp"
-            android:textStyle="bold" />
-
-    <ListView
-            android:id="@+id/operationsList"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:padding="10dip"
-            android:divider="@android:color/transparent"
-            android:dividerHeight="10dip" />
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-        <Button
-                android:id="@+id/resetOperationsButton"
-                style="@style/FilterShowHistoryButton"
-                android:gravity="center"
-                android:text="@string/reset" />
-
-        <Button
-                android:id="@+id/saveOperationsButton"
-                style="@style/FilterShowHistoryButton"
-                android:text="@string/save"
-                android:visibility="gone" />
-    </LinearLayout>
-</LinearLayout>

diff --git a/res/layout/filtershow_state_panel.xml b/res/layout/filtershow_state_panel.xml
deleted file mode 100644 (file)
index 1f9f970..0000000
--- a/res/layout/filtershow_state_panel.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     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"
-        android:id="@+id/imageStatePanel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_weight="1"
-        android:visibility="visible" >
-
-    <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:gravity="center"
-            android:padding="2dip"
-            android:text="@string/imageState"
-            android:textColor="@android:color/white"
-            android:textSize="24sp"
-            android:textStyle="bold" />
-
-    <ListView
-            android:id="@+id/imageStateList"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" >
-    </ListView>
-
-</LinearLayout>
\ No newline at end of file