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

3 files changed, 106 insertions, 67 deletions

diff --git a/res/layout/filtershow_color_picker.xml b/res/layout/filtershow_color_picker.xml
index ab264104c..e2af5bd2b 100644
--- a/res/layout/filtershow_color_picker.xml
+++ b/res/layout/filtershow_color_picker.xml
@@ -16,7 +16,8 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
+              android:background="@color/background_main_toolbar">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:orientation="vertical"
@@ -25,31 +26,64 @@
                   android:layout_height="match_parent"
                   android:background="@color/default_background">
 
-        <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="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="8dp"
+                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_height="256dp"
+                android:layout_marginTop="0dp"
                 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" />
 
-        <Button
-                android:id="@+id/btnSelect"
+        <com.android.gallery3d.filtershow.colorpicker.ColorOpacityView
+                android:id="@+id/colorOpacityView"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/color_pick_select"
-                android:layout_margin="14dp"/>
+                android:layout_marginTop="24dp"
+                android:layout_height="32dp" />
 
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="match_parent"
+                      android:layout_height="match_parent"
+                      android:layout_marginTop="4dp">
+            <ImageButton
+                    android:id="@+id/cancelColorPick"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="left|center_vertical"
+                    android:background="@android:color/transparent"
+                    android:layout_weight=".1"
+                    android:gravity="center"
+                    android:src="@drawable/ic_menu_cancel_holo_light"
+                    android:textSize="18dip"/>
+
+            <ImageView
+                    android:layout_width="2dp"
+                    android:layout_height="fill_parent"
+                    android:src="@drawable/filtershow_vertical_bar"/>
+            <ImageButton
+                    android:id="@+id/applyColorPick"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="right|center_vertical"
+                    android:layout_weight=".1"
+                    android:background="@android:color/transparent"
+                    android:gravity="center"
+                    android:src="@drawable/ic_menu_done_holo_light"
+                    android:textSize="18dip"/>
+        </LinearLayout>
     </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_control_color_chooser.xml b/res/layout/filtershow_control_color_chooser.xml
index 706402c2e..5bfe46031 100644
--- 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>
 
diff --git a/res/layout/filtershow_control_style_chooser.xml b/res/layout/filtershow_control_style_chooser.xml
index b0426e3d1..9588ea208 100644
--- a/res/layout/filtershow_control_style_chooser.xml
+++ b/res/layout/filtershow_control_style_chooser.xml
@@ -18,7 +18,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="32dp"
     android:orientation="horizontal" >
             <HorizontalScrollView
                 android:id="@+id/scrollList"
@@ -32,6 +32,7 @@
                     android:layout_height="match_parent"
                     android:orientation="horizontal" >
                 </LinearLayout>
+
             </HorizontalScrollView>
 </LinearLayout>