From e7c3060c9bdc3def890d4e6f6c05c7629269f83f Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Tue, 24 Sep 2013 16:55:58 -0700
Subject: fix layout issues with border

Change-Id: I92e7a86524a40f379eaa39af4b56500c33e97423
---
 res/layout-land/filtershow_color_border_ui.xml | 76 ++++++++++++++------------
 1 file changed, 40 insertions(+), 36 deletions(-)

(limited to 'res/layout-land')

diff --git a/res/layout-land/filtershow_color_border_ui.xml b/res/layout-land/filtershow_color_border_ui.xml
index e65c3485a..9945d9d63 100644
--- a/res/layout-land/filtershow_color_border_ui.xml
+++ b/res/layout-land/filtershow_color_border_ui.xml
@@ -37,13 +37,6 @@
                 android:orientation="vertical"
                 android:visibility="visible">
 
-            <Button
-                    android:id="@+id/clearButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:text="@string/color_border_clear"/>
-
             <GridLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
@@ -174,68 +167,79 @@
             android:layout_marginLeft="1dp"
             android:layout_marginRight="1dp">
 
-        <HorizontalScrollView
-                android:id="@+id/scrollList"
-                android:layout_width="0dp"
-                android:layout_weight="5"
-                android:layout_height="match_parent"
-                android:scrollbars="none">
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginLeft="1dp"
+                android:layout_marginRight="1dp">
 
             <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="0dip"
-                        android:layout_height="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp"/>
+                        android:layout_marginRight="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button02"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp"/>
+                        android:layout_marginRight="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button03"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp"/>
+                        android:layout_marginRight="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button04"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp"/>
+                        android:layout_marginRight="4dp"/>
 
                 <Button
                         android:id="@+id/draw_color_button05"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:layout_height="wrap_content"
                         android:background="@drawable/filtershow_color_picker_circle"
-                        android:layout_margin="2dp"/>
+                        android:layout_marginRight="4dp"/>
 
             </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="48dp"
+                        android:layout_gravity="center"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/ic_action_overflow"
+                        />
+            </FrameLayout>
+        </LinearLayout>
+
+
 
-        <Button
-                android:id="@+id/draw_color_popupbutton"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:drawable/ic_menu_more"
-                android:layout_margin="1dp"/>
     </LinearLayout>
 </LinearLayout>
-- 
cgit v1.2.3