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

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

diff --git a/res/layout/filtershow_state_panel_new.xml b/res/layout/filtershow_state_panel_new.xml
index d2d59ab..b199695 100644 (file)
--- a/res/layout/filtershow_state_panel_new.xml
+++ b/res/layout/filtershow_state_panel_new.xml
@@ -12,9 +12,14 @@
             android:layout_height="1dip"
             android:layout_width="match_parent"/>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
     <HorizontalScrollView
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:scrollbars="none">
 
         <com.android.gallery3d.filtershow.state.StatePanelTrack
@@ -24,9 +29,24 @@
                 android:layout_height="48dip"
                 custom:elemEndSize="128dip"
                 custom:elemSize="128dip"
-                android:layout_margin="8dip"
+                android:layout_margin="0dip"
                 android:animateLayoutChanges="true" />
 
     </HorizontalScrollView>
 
+    <ImageButton
+            android:id="@+id/toggleVersionsPanel"
+            android:layout_width="wrap_content"
+            android:layout_height="48dip"
+            android:src="@drawable/filtershow_versions_compare"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_gravity="center"/>
+
+    </LinearLayout>
+
+    <View
+            android:background="@color/toolbar_separation_line"
+            android:layout_height="1dip"
+            android:layout_width="match_parent"/>
+
 </LinearLayout>