Draw UI fixes

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

diff --git a/res/layout/filtershow_control_color_chooser.xml b/res/layout/filtershow_control_color_chooser.xml
index 706402c..5bfe460 100644 (file)
--- a/res/layout/filtershow_control_color_chooser.xml
+++ b/res/layout/filtershow_control_color_chooser.xml
@@ -20,63 +20,67 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal" >
-            <HorizontalScrollView
-                android:id="@+id/scrollList"
+    <LinearLayout
+            android:id="@+id/listColors"
+            android:layout_weight="5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <Button
+                android:id="@+id/draw_color_button01"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@drawable/filtershow_color_picker_circle"
+                android:layout_marginRight="4dp"/>
+
+        <Button
+                android:id="@+id/draw_color_button02"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@drawable/filtershow_color_picker_circle"
+                android:layout_marginRight="4dp"/>
+
+        <Button
+                android:id="@+id/draw_color_button03"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@drawable/filtershow_color_picker_circle"
+                android:layout_marginRight="4dp"/>
+
+        <Button
+                android:id="@+id/draw_color_button04"
                 android:layout_width="0dp"
-                android:layout_weight="5"
-                android:layout_height="match_parent"
-                android:scrollbars="none" >
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@drawable/filtershow_color_picker_circle"
+                android:layout_marginRight="4dp"/>
 
-                <LinearLayout
-                    android:id="@+id/listStyles"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal" >
+        <Button
+                android:id="@+id/draw_color_button05"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:background="@drawable/filtershow_color_picker_circle"
+                android:layout_marginRight="4dp"/>
 
-                <Button
-                        android:id="@+id/draw_color_button01"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp" />
-                <Button
-                        android:id="@+id/draw_color_button02"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp" />
-                <Button
-                        android:id="@+id/draw_color_button03"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp" />
-                <Button
-                        android:id="@+id/draw_color_button04"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp" />
-                <Button
-                        android:id="@+id/draw_color_button05"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp" />
+    </LinearLayout>
 
-                </LinearLayout>
-            </HorizontalScrollView>
+    <FrameLayout
+            android:background="@color/background_main_toolbar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
     <Button
             android:id="@+id/draw_color_popupbutton"
-            android:layout_width="@dimen/draw_style_icon_dim"
-            android:layout_height="@dimen/draw_style_icon_dim"
-            android:background="@android:drawable/ic_menu_more"
-            android:layout_margin="1dp"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center"
+            android:layout_height="wrap_content"
+            android:background="@drawable/ic_action_overflow"
             />
+    </FrameLayout>
 </LinearLayout>