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 c559319..7332657 100644 (file)
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -22,6 +22,11 @@
     android:orientation="vertical"
     android:visibility="visible" >
 
+    <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"
@@ -46,7 +51,7 @@
 
         <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="56dip"
+                android:layout_height="48dip"
                 android:background="@color/background_main_toolbar"
                 android:orientation="horizontal"
                 android:baselineAligned="false"
@@ -85,7 +90,8 @@
                         android:gravity="center"
                         android:text="@string/apply_effect"
                         android:textSize="18dip"
-                        android:drawableRight="@drawable/filtershow_menu_marker"/>
+                        android:drawableRight="@drawable/filtershow_menu_marker"
+                        android:textAllCaps="true" />
 
             </LinearLayout>
 
@@ -109,9 +115,7 @@
         <FrameLayout android:id="@+id/state_panel_container"
                      android:layout_width="match_parent"
                      android:layout_height="wrap_content"
-                     android:visibility="visible"
-                     android:layout_gravity="top"
-                     android:layout_weight="1" />
+                     android:visibility="visible" />
 
     </LinearLayout>