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 7711221..b199695 100644 (file)
--- a/res/layout/filtershow_state_panel_new.xml
+++ b/res/layout/filtershow_state_panel_new.xml
@@ -1,47 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
+              xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+              android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <!--
-    <com.example.StatePanel.VerticalStatePanelTrack
-            android:id="@+id/listStates"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="8dip"
-            android:background="@android:color/holo_red_dark" />
-            -->
-
-    <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="none">
+              android:layout_height="wrap_content"
+              android:background="@color/background_main_toolbar">
 
-    <com.android.gallery3d.filtershow.state.StatePanelTrack
-            android:id="@+id/listStates"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="8dip"
-            android:animateLayoutChanges="true" />
+    <View
+            android:background="@color/toolbar_separation_line"
+            android:layout_height="1dip"
+            android:layout_width="match_parent"/>
 
-    </ScrollView>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <!--
     <HorizontalScrollView
-            android:layout_width="match_parent"
-            android:layout_height="128dip"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:scrollbars="none">
 
-        <com.example.StatePanel.StatePanelTrack
+        <com.android.gallery3d.filtershow.state.StatePanelTrack
                 android:id="@+id/listStates"
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="128dip"
+                android:layout_height="48dip"
+                custom:elemEndSize="128dip"
+                custom:elemSize="128dip"
+                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>