split filter show into multiple files

Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535

4 files changed, 184 insertions, 252 deletions

diff --git a/res/layout-land/filtershow_activity.xml b/res/layout-land/filtershow_activity.xml
index 066dffad9..d6f2f5d84 100644
--- a/res/layout-land/filtershow_activity.xml
+++ b/res/layout-land/filtershow_activity.xml
@@ -113,91 +113,13 @@
                             android:orientation="horizontal"
                             android:visibility="gone" >
 
-                            <LinearLayout
-                            android:id="@+id/top"
+                        <ViewStub android:id="@+id/editorPanelStub"
+                            android:inflatedId="@+id/editorPanel"
+                            android:layout="@layout/filtershow_editor_panel"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_weight="0"
-                            android:orientation="vertical"
-                            android:visibility="visible" >
-
-                            <LinearLayout
-                                android:id="@+id/controlArea"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:orientation="horizontal"
-                                android:background="@android:color/transparent"
-                                android:visibility="visible" >
-
-                                <SeekBar
-                                    android:id="@+id/primarySeekBar"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:background="@android:color/transparent"
-                                    android:layout_weight="1" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:background="@color/filtershow_background"
-                                android:orientation="horizontal"
-                                android:visibility="visible" >
-
-                                <ImageButton
-                                    android:id="@+id/cancelFilter"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="94dip"
-                                    android:layout_gravity="left"
-                                    android:layout_weight=".1"
-                                    android:background="@android:color/transparent"
-                                    android:gravity="center"
-                                    android:src="@drawable/ic_menu_cancel_holo_light"
-                                    android:textSize="18dip" />
-
-                                <ImageView
-                                    android:layout_width="2dp"
-                                    android:layout_height="fill_parent"
-                                    android:src="@drawable/filtershow_vertical_line" />
-
-                                <LinearLayout
-                                    android:id="@+id/panelAccessoryViewList"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="match_parent"
-                                    android:layout_weight="1"
-                                    android:orientation="horizontal"
-                                    android:visibility="visible" >
-
-                                    <Button
-                                        android:id="@+id/applyEffect"
-                                        android:layout_width="fill_parent"
-                                        android:layout_height="fill_parent"
-                                        android:layout_gravity="center"
-                                        android:background="@android:color/transparent"
-                                        android:gravity="center"
-                                        android:text="@string/apply_effect"
-                                        android:textSize="18dip" />
-                                </LinearLayout>
-
-                                <ImageView
-                                    android:layout_width="2dp"
-                                    android:layout_height="fill_parent"
-                                    android:src="@drawable/filtershow_vertical_line" />
-
-                                <ImageButton
-                                    android:id="@+id/applyFilter"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="94dip"
-                                    android:layout_gravity="right"
-                                    android:layout_weight=".1"
-                                    android:background="@android:color/transparent"
-                                    android:gravity="center"
-                                    android:src="@drawable/ic_menu_done_holo_light"
-                                    android:textSize="18dip" />
-                            </LinearLayout>
-                        </LinearLayout>
+                            android:visibility="visible"  />
+
                     </LinearLayout>
 
                     <HorizontalScrollView
@@ -281,50 +203,12 @@
                         custom:max_width="400dip"
                         android:orientation="vertical">
 
-                    <LinearLayout
-                            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>
+                       <ViewStub android:id="@+id/stateCategoryStub"
+                          android:inflatedId="@+id/imageCategoryPanel"
+                          android:layout="@layout/filtershow_category_panel"
+                          android:layout_width="match_parent"
+                          android:layout_height="48dip"
+                          android:visibility="visible" />
 
                 </com.android.gallery3d.filtershow.CenteredLinearLayout>
 
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 2833e0b90..69e4c08a9 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -89,89 +89,12 @@
                         android:orientation="horizontal"
                         android:visibility="gone" >
 
-                        <LinearLayout
-                            android:id="@+id/top"
+                        <ViewStub android:id="@+id/editorPanelStub"
+                            android:inflatedId="@+id/editorPanel"
+                            android:layout="@layout/filtershow_editor_panel"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_weight="0"
-                            android:orientation="vertical"
-                            android:visibility="visible" >
-
-                            <LinearLayout
-                                android:id="@+id/controlArea"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:orientation="horizontal"
-                                android:visibility="visible" >
-
-                                <SeekBar
-                                    android:id="@+id/primarySeekBar"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:background="@color/filtershow_background"
-                                android:orientation="horizontal"
-                                android:visibility="visible" >
-
-                                <ImageButton
-                                    android:id="@+id/cancelFilter"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="94dip"
-                                    android:layout_gravity="left"
-                                    android:layout_weight=".1"
-                                    android:background="@android:color/transparent"
-                                    android:gravity="center"
-                                    android:src="@drawable/ic_menu_cancel_holo_light"
-                                    android:textSize="18dip" />
-
-                                <ImageView
-                                    android:layout_width="2dp"
-                                    android:layout_height="fill_parent"
-                                    android:src="@drawable/filtershow_vertical_line" />
-
-                                <LinearLayout
-                                    android:id="@+id/panelAccessoryViewList"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="match_parent"
-                                    android:layout_weight="1"
-                                    android:orientation="horizontal"
-                                    android:visibility="visible" >
-
-                                    <Button
-                                        android:id="@+id/applyEffect"
-                                        android:layout_width="fill_parent"
-                                        android:layout_height="fill_parent"
-                                        android:layout_gravity="center"
-                                        android:background="@android:color/transparent"
-                                        android:gravity="center"
-                                        android:text="@string/apply_effect"
-                                        android:textSize="18dip" />
-                                </LinearLayout>
-
-                                <ImageView
-                                    android:layout_width="2dp"
-                                    android:layout_height="fill_parent"
-                                    android:src="@drawable/filtershow_vertical_line" />
-
-                                <ImageButton
-                                    android:id="@+id/applyFilter"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="94dip"
-                                    android:layout_gravity="right"
-                                    android:layout_weight=".1"
-                                    android:background="@android:color/transparent"
-                                    android:gravity="center"
-                                    android:src="@drawable/ic_menu_done_holo_light"
-                                    android:textSize="18dip" />
-                            </LinearLayout>
-                        </LinearLayout>
+                            android:visibility="visible"  />
                     </LinearLayout>
 
             <HorizontalScrollView
@@ -255,50 +178,12 @@
               custom:max_width="400dip"
               android:orientation="vertical">
 
-        <LinearLayout
-            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>
+             <ViewStub android:id="@+id/stateCategoryStub"
+                  android:inflatedId="@+id/imageCategoryPanel"
+                  android:layout="@layout/filtershow_category_panel"
+                  android:layout_width="match_parent"
+                  android:layout_height="48dip"
+                  android:visibility="visible" />
 
         </com.android.gallery3d.filtershow.CenteredLinearLayout>
 
diff --git a/res/layout/filtershow_category_panel.xml b/res/layout/filtershow_category_panel.xml
new file mode 100644
index 000000000..c1b8bbe35
--- /dev/null
+++ b/res/layout/filtershow_category_panel.xml
@@ -0,0 +1,62 @@
+<?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_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
new file mode 100644
index 000000000..fbff33f7e
--- /dev/null
+++ b/res/layout/filtershow_editor_panel.xml
@@ -0,0 +1,101 @@
+<?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/top"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="0"
+    android:orientation="vertical"
+    android:visibility="visible" >
+
+    <LinearLayout
+        android:id="@+id/controlArea"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:visibility="visible" >
+
+        <SeekBar
+            android:id="@+id/primarySeekBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:background="@color/filtershow_background"
+        android:orientation="horizontal"
+        android:visibility="visible" >
+
+        <ImageButton
+            android:id="@+id/cancelFilter"
+            android:layout_width="wrap_content"
+            android:layout_height="94dip"
+            android:layout_gravity="left"
+            android:layout_weight=".1"
+            android:background="@android:color/transparent"
+            android:gravity="center"
+            android:src="@drawable/ic_menu_cancel_holo_light"
+            android:textSize="18dip" />
+
+        <ImageView
+            android:layout_width="2dp"
+            android:layout_height="fill_parent"
+            android:src="@drawable/filtershow_vertical_line" />
+
+        <LinearLayout
+            android:id="@+id/panelAccessoryViewList"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:visibility="visible" >
+
+            <Button
+                android:id="@+id/applyEffect"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_gravity="center"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:text="@string/apply_effect"
+                android:textSize="18dip" />
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="2dp"
+            android:layout_height="fill_parent"
+            android:src="@drawable/filtershow_vertical_line" />
+
+        <ImageButton
+            android:id="@+id/applyFilter"
+            android:layout_width="wrap_content"
+            android:layout_height="94dip"
+            android:layout_gravity="right"
+            android:layout_weight=".1"
+            android:background="@android:color/transparent"
+            android:gravity="center"
+            android:src="@drawable/ic_menu_done_holo_light"
+            android:textSize="18dip" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file