Draw UI fixes

bug:10705772
Change-Id: I529d178cdd4fc910b50a3f8c72187b1c61924743

11 files changed, 203 insertions, 123 deletions

diff --git a/res/drawable-hdpi/ic_action_overflow.png b/res/drawable-hdpi/ic_action_overflow.png
new file mode 100644
index 000000000..18bc4c5e8
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_overflow.png
diff --git a/res/drawable-mdpi/ic_action_overflow.png b/res/drawable-mdpi/ic_action_overflow.png
new file mode 100644
index 000000000..b58b7c96d
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_overflow.png
diff --git a/res/drawable-xhdpi/ic_action_overflow.png b/res/drawable-xhdpi/ic_action_overflow.png
new file mode 100644
index 000000000..799c35caa
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_overflow.png
diff --git a/res/drawable/filtershow_color_picker_circle.xml b/res/drawable/filtershow_color_picker_circle.xml
index 915425222..433df4800 100644
--- a/res/drawable/filtershow_color_picker_circle.xml
+++ b/res/drawable/filtershow_color_picker_circle.xml
@@ -16,11 +16,11 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <size android:width="20dp" android:height="20dp"/>
+    <size android:width="16dp" android:height="16dp"/>
     <corners
-        android:radius="10dp" />
+        android:radius="0dp" />
     <solid android:color="@color/red"/>
-    <stroke android:width="2dp"
+    <stroke android:width="0dp"
             android:color="#ff000000"/>
 </shape>
 
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>
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>
 
diff --git a/res/values-xlarge/filtershow_values.xml b/res/values-xlarge/filtershow_values.xml
index c6fe3996b..6d0906a50 100644
--- a/res/values-xlarge/filtershow_values.xml
+++ b/res/values-xlarge/filtershow_values.xml
@@ -29,4 +29,7 @@
 
     <!-- Category Panel Text Size -->
     <dimen name="category_panel_margin">4dip</dimen>
+
+    <!-- draw check UI size  -->
+    <dimen name="draw_ui_width">350dip</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml
index 0cf723f8f..69eb49dc7 100644
--- a/res/values/filtershow_values.xml
+++ b/res/values/filtershow_values.xml
@@ -51,7 +51,15 @@
     <!-- Grad filter minimum touch distance -->
     <dimen name="draw_rect_round">10dip</dimen>
 
-    <!-- Grad filter minimum touch distance -->
-    <dimen name="draw_style_icon_dim">64dip</dimen>
+    <!-- draw color icon size -->
+    <dimen name="draw_style_icon_dim">42dip</dimen>
+
+    <!-- draw color icon size -->
+    <dimen name="draw_color_icon_dim">42dip</dimen>
+
+    <!-- draw check UI size  -->
+    <dimen name="draw_color_check_dim">5dip</dimen>
 
+    <!-- draw check UI size  -->
+    <dimen name="draw_ui_width">192dip</dimen>
 </resources>
\ No newline at end of file