Merge "Draw UI fixes" into gb-ub-photos-carlsbad

2 files changed, 81 insertions, 51 deletions

diff --git a/res/layout-land/filtershow_color_border_ui.xml b/res/layout-land/filtershow_color_border_ui.xml
index f16ea2cea..e65c3485a 100644
--- a/res/layout-land/filtershow_color_border_ui.xml
+++ b/res/layout-land/filtershow_color_border_ui.xml
@@ -132,25 +132,36 @@
                     android:layout_marginLeft="8dip"
                     android:id="@+id/textView"/>
 
-            <com.android.gallery3d.filtershow.colorpicker.ColorOpacityView
-                    android:id="@+id/colorOpacityView"
+
+            <com.android.gallery3d.filtershow.colorpicker.ColorCompareView
+                    android:id="@+id/btnSelect"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"/>
+                    android:layout_height="32dp"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginRight="18dp"
+                    android:layout_marginTop="0dp"
+                    android:layout_marginBottom="0dp"
+                    />
 
             <com.android.gallery3d.filtershow.colorpicker.ColorSVRectView
                     android:id="@+id/colorRectView"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="4"
+                    android:layout_width="@dimen/draw_ui_width"
+                    android:layout_height="@dimen/draw_ui_width"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="8dp"
                     android:layout_marginRight="1dp"/>
 
             <com.android.gallery3d.filtershow.colorpicker.ColorHueView
                     android:id="@+id/ColorHueView"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"/>
+                    android:layout_marginTop="0dp"
+                    android:layout_height="32dp" />
 
+            <com.android.gallery3d.filtershow.colorpicker.ColorOpacityView
+                    android:id="@+id/colorOpacityView"
+                    android:layout_width="match_parent"
+                    android:layout_marginTop="24dp"
+                    android:layout_height="32dp" />
         </LinearLayout>
     </FrameLayout>
 
diff --git a/res/layout-land/filtershow_draw_ui.xml b/res/layout-land/filtershow_draw_ui.xml
index b98a87c5c..5e0a32725 100644
--- a/res/layout-land/filtershow_draw_ui.xml
+++ b/res/layout-land/filtershow_draw_ui.xml
@@ -42,13 +42,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:text="@string/draw_clear"/>
+                    android:text="@string/draw_clear"
+                    android:visibility="gone"/>
 
             <GridLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
                     android:columnCount="2"
+                    android:layout_marginBottom="3dp"
                     android:orientation="horizontal">
 
                 <TextView
@@ -67,6 +69,7 @@
                         android:id="@+id/drawSizeSeekBar"
                         android:layout_width="match_parent"
                         android:layout_column="0"
+                        android:progress="20"
                         android:layout_columnSpan="2"
                         android:layout_gravity="fill_horizontal"
                         style="@style/FilterShowSlider"/>
@@ -93,8 +96,10 @@
         <LinearLayout
                 android:id="@+id/colorPicker"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="8dp"
                 android:visibility="gone">
 
             <TextView
@@ -102,26 +107,38 @@
                     android:layout_height="wrap_content"
                     android:text="@string/draw_color"
                     android:layout_marginLeft="8dip"
-                    android:id="@+id/textView"/>
+                    android:id="@+id/textView"
+                    android:visibility="gone"/>
 
-            <com.android.gallery3d.filtershow.colorpicker.ColorOpacityView
-                    android:id="@+id/colorOpacityView"
+            <com.android.gallery3d.filtershow.colorpicker.ColorCompareView
+                    android:id="@+id/btnSelect"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"/>
+                    android:layout_height="32dp"
+                    android:layout_marginLeft="18dp"
+                    android:layout_marginRight="18dp"
+                    android:layout_marginTop="0dp"
+                    android:layout_marginBottom="0dp"
+                    />
 
             <com.android.gallery3d.filtershow.colorpicker.ColorSVRectView
                     android:id="@+id/colorRectView"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="4"
+                    android:layout_width="@dimen/draw_ui_width"
+                    android:layout_height="@dimen/draw_ui_width"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="8dp"
                     android:layout_marginRight="1dp"/>
 
             <com.android.gallery3d.filtershow.colorpicker.ColorHueView
                     android:id="@+id/ColorHueView"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"/>
+                    android:layout_marginTop="0dp"
+                    android:layout_height="32dp" />
+
+            <com.android.gallery3d.filtershow.colorpicker.ColorOpacityView
+                    android:id="@+id/colorOpacityView"
+                    android:layout_width="match_parent"
+                    android:layout_marginTop="24dp"
+                    android:layout_height="32dp" />
 
         </LinearLayout>
     </FrameLayout>
@@ -135,68 +152,70 @@
             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: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>
-
-        <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"/>
+
+        <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>
+        <!--@drawable/ic_action_overflow
+        @android:drawable/ic_menu_more-->
     </LinearLayout>
 </LinearLayout>