merge in klp-release history after reset to klp-dev

[android-x86/packages-apps-Gallery2.git] / res / layout / filtershow_editor_panel.xml

diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
index 2d085a8..7332657 100644 (file)
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -19,88 +19,104 @@
     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="64dp"
-        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"
-            style="@style/FilterShowSlider" />
-
-    </LinearLayout>
+    <View
+            android:background="@color/toolbar_separation_line"
+            android:layout_height="1dip"
+            android:layout_width="match_parent"/>
 
     <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|center_vertical"
-            android:layout_weight=".1"
-            android:background="@drawable/filtershow_button_background"
-            android:gravity="center"
-            android:src="@drawable/ic_menu_cancel_holo_light"
-            android:textSize="18dip" 
-            style="@style/FilterShowBottomButton" />
-
-        <ImageView
-            android:layout_width="2dp"
-            android:layout_height="fill_parent"
-            android:src="@drawable/filtershow_vertical_bar" />
+        android:orientation="vertical">
 
         <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="@drawable/filtershow_button_background"
-                android:gravity="center"
-                android:text="@string/apply_effect"
-                android:textSize="18dip"
-                android:drawableRight="@drawable/filtershow_menu_marker"/>
+                android:id="@+id/controlArea"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_alignParentBottom="true"
+                android:visibility="visible">
+
+            <SeekBar
+                    android:id="@+id/primarySeekBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    style="@style/FilterShowSlider"/>
+
         </LinearLayout>
 
-        <ImageView
-            android:layout_width="2dp"
-            android:layout_height="fill_parent"
-            android:src="@drawable/filtershow_vertical_bar" />
-
-        <ImageButton
-            android:id="@+id/applyFilter"
-            android:layout_width="wrap_content"
-            android:layout_height="94dip"
-            android:layout_gravity="right|center_vertical"
-            android:layout_weight=".1"
-            android:background="@drawable/filtershow_button_background"
-            android:gravity="center"
-            android:src="@drawable/ic_menu_done_holo_light"
-            android:textSize="18dip" 
-            style="@style/FilterShowBottomButton" />
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="48dip"
+                android:background="@color/background_main_toolbar"
+                android:orientation="horizontal"
+                android:baselineAligned="false"
+                android:visibility="visible">
+
+            <ImageButton
+                    android:id="@+id/cancelFilter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="left|center_vertical"
+                    android:background="@android:color/transparent"
+                    android:layout_weight=".1"
+                    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_bar"/>
+
+            <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">
+
+                <com.android.gallery3d.filtershow.editors.SwapButton
+                        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"
+                        android:drawableRight="@drawable/filtershow_menu_marker"
+                        android:textAllCaps="true" />
+
+            </LinearLayout>
+
+            <ImageView
+                    android:layout_width="2dp"
+                    android:layout_height="fill_parent"
+                    android:src="@drawable/filtershow_vertical_bar"/>
+
+            <ImageButton
+                    android:id="@+id/applyFilter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="right|center_vertical"
+                    android:layout_weight=".1"
+                    android:background="@android:color/transparent"
+                    android:gravity="center"
+                    android:src="@drawable/ic_menu_done_holo_light"
+                    android:textSize="18dip"/>
+        </LinearLayout>
+
+        <FrameLayout android:id="@+id/state_panel_container"
+                     android:layout_width="match_parent"
+                     android:layout_height="wrap_content"
+                     android:visibility="visible" />
+
     </LinearLayout>
 
 </LinearLayout>