[UX 4.6] Implementation of Button and color picker UX.

Change-Id: Id80330114d648150020d097eb55565682ea7f552

Conflicts:

	themes/images/tizen-hd/Controls/00_circle_button.png
	themes/images/tizen-hd/Controls/00_circle_button_delete.png
	themes/images/tizen-hd/Controls/00_circle_button_delete_dim.png
	themes/images/tizen-hd/Controls/00_circle_button_dim.png
	themes/images/tizen-hd/Controls/00_circle_button_press.png

diff --git a/themes/images/tizen-hd/00_icon_SIP_close.png b/themes/images/tizen-hd/00_icon_SIP_close.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/themes/images/tizen-hd/Controls/00_button_01.png b/themes/images/tizen-hd/Controls/00_button_01.png
index fe39033..163bed6 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_01.png and b/themes/images/tizen-hd/Controls/00_button_01.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_01_Delete.png b/themes/images/tizen-hd/Controls/00_button_01_Delete.png
index 6ae4cf2..f381a57 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_01_Delete.png and b/themes/images/tizen-hd/Controls/00_button_01_Delete.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_01_Delete_dim.png b/themes/images/tizen-hd/Controls/00_button_01_Delete_dim.png
index 8f9c53d..f381a57 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_01_Delete_dim.png and b/themes/images/tizen-hd/Controls/00_button_01_Delete_dim.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_01_dim.png b/themes/images/tizen-hd/Controls/00_button_01_dim.png
index fe39033..163bed6 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_01_dim.png and b/themes/images/tizen-hd/Controls/00_button_01_dim.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_01_send.png b/themes/images/tizen-hd/Controls/00_button_01_send.png
index edc82c1..bc58cb5 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_01_send.png and b/themes/images/tizen-hd/Controls/00_button_01_send.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_01_send_dim.png b/themes/images/tizen-hd/Controls/00_button_01_send_dim.png
index edc82c1..bc58cb5 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_01_send_dim.png and b/themes/images/tizen-hd/Controls/00_button_01_send_dim.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_01_send_press.png b/themes/images/tizen-hd/Controls/00_button_01_send_press.png
index 7a99f6c..6e80527 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_01_send_press.png and b/themes/images/tizen-hd/Controls/00_button_01_send_press.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_off.png b/themes/images/tizen-hd/Controls/00_button_off.png
index ad2bd67..e58e522 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_off.png and b/themes/images/tizen-hd/Controls/00_button_off.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_off_dim.png b/themes/images/tizen-hd/Controls/00_button_off_dim.png
index 99e90d4..340ee9d 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_off_dim.png and b/themes/images/tizen-hd/Controls/00_button_off_dim.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_on.png b/themes/images/tizen-hd/Controls/00_button_on.png
index e366b46..af8cdc5 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_on.png and b/themes/images/tizen-hd/Controls/00_button_on.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_on_dim.png b/themes/images/tizen-hd/Controls/00_button_on_dim.png
index d72d257..202898a 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_on_dim.png and b/themes/images/tizen-hd/Controls/00_button_on_dim.png differ

diff --git a/themes/images/tizen-hd/Controls/00_button_on_off_handler_dim.png b/themes/images/tizen-hd/Controls/00_button_on_off_handler_dim.png
index f23fc4a..e87a16e 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_button_on_off_handler_dim.png and b/themes/images/tizen-hd/Controls/00_button_on_off_handler_dim.png differ

diff --git a/themes/images/tizen-hd/Controls/00_circle_button.png b/themes/images/tizen-hd/Controls/00_circle_button.png
index cb91a99..fefde0f 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_circle_button.png and b/themes/images/tizen-hd/Controls/00_circle_button.png differ

diff --git a/themes/images/tizen-hd/Controls/00_circle_button_delete.png b/themes/images/tizen-hd/Controls/00_circle_button_delete.png
index 794397c..314757d 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_circle_button_delete.png and b/themes/images/tizen-hd/Controls/00_circle_button_delete.png differ

diff --git a/themes/images/tizen-hd/Controls/00_circle_button_delete_dim.png b/themes/images/tizen-hd/Controls/00_circle_button_delete_dim.png
index 794397c..6659671 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_circle_button_delete_dim.png and b/themes/images/tizen-hd/Controls/00_circle_button_delete_dim.png differ

diff --git a/themes/images/tizen-hd/Controls/00_circle_button_dim.png b/themes/images/tizen-hd/Controls/00_circle_button_dim.png
index cb91a99..fefde0f 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_circle_button_dim.png and b/themes/images/tizen-hd/Controls/00_circle_button_dim.png differ

diff --git a/themes/images/tizen-hd/Controls/00_circle_button_press.png b/themes/images/tizen-hd/Controls/00_circle_button_press.png
index cb12641..5699f86 100644 (file)
Binary files a/themes/images/tizen-hd/Controls/00_circle_button_press.png and b/themes/images/tizen-hd/Controls/00_circle_button_press.png differ

diff --git a/themes/images/tizen-hd/Controls/00_color_picker_focus.png b/themes/images/tizen-hd/Controls/00_color_picker_handler.png
similarity index 100%
rename from themes/images/tizen-hd/Controls/00_color_picker_focus.png
rename to themes/images/tizen-hd/Controls/00_color_picker_handler.png

diff --git a/themes/images/tizen-hd/Naviframe/00_toolbar_button.png b/themes/images/tizen-hd/Naviframe/00_toolbar_button.png
index 9349f2a..269c1cc 100644 (file)
Binary files a/themes/images/tizen-hd/Naviframe/00_toolbar_button.png and b/themes/images/tizen-hd/Naviframe/00_toolbar_button.png differ

diff --git a/themes/images/tizen-hd/Naviframe/00_toolbar_button_dim.png b/themes/images/tizen-hd/Naviframe/00_toolbar_button_dim.png
index 9349f2a..269c1cc 100644 (file)
Binary files a/themes/images/tizen-hd/Naviframe/00_toolbar_button_dim.png and b/themes/images/tizen-hd/Naviframe/00_toolbar_button_dim.png differ

diff --git a/themes/images/tizen-hd/Naviframe/00_toolbar_button_press.png b/themes/images/tizen-hd/Naviframe/00_toolbar_button_press.png
index 2458078..17251d8 100644 (file)
Binary files a/themes/images/tizen-hd/Naviframe/00_toolbar_button_press.png and b/themes/images/tizen-hd/Naviframe/00_toolbar_button_press.png differ

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 3ca9386..7dec94b 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -426,7 +426,8 @@
 #define BUTTON_BUBBLE_CIRCLE_SENT_ICON_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_BUBBLE_CIRCLE_SENT_ICON_DISABLED_COLOR_INC 101 101 101 76
 
-#define BUTTON_DATETIME_AMPM_BG_MIN_INC 106 56
+#define BUTTON_DATETIME_AMPM_BG_MIN_INC 95 60
+#define BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC 34
 
 #define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 13 13 13 13
 #define BUTTON_SEARCH_BUTTON_BG_MIN_INC 100 66
@@ -472,6 +473,8 @@
 #define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 72 72
 #define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 45 45
 #define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 45 45
+#define BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC 13 13
+#define BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC 14 14
 
 #define BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC 72
 #define BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC 72

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 9ef64b6..cf30280 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -608,6 +608,7 @@
                fixed: 1 1;
                color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
                color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
+               text.size: BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC;
                text.min: 1 1;
             }
             description { state: "visible" 0.0;
@@ -2416,6 +2417,33 @@
                image.normal: "00_circle_button_dim.png"; \
             } \
          } \
+         part { name: "left_top_padding"; \
+            scale: 1; \
+            type: SPACER; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \
+               max: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \
+               fixed: 1 1; \
+               align: 0.0 0.0; \
+               rel1.to: "button_image"; \
+               rel2.to: "button_image"; \
+            } \
+         } \
+         part { name: "right_bottom_padding"; \
+            scale: 1; \
+            type: SPACER; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \
+               max: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \
+               fixed: 1 1; \
+               align: 1.0 1.0; \
+               rel1 { \
+                  relative: 1.0 1.0; \
+                  to: "button_image"; \
+               } \
+               rel2.to: "button_image"; \
+            } \
+         } \
          part { name: "button_center_part"; \
             scale: 1; \
             clip_to: "icon_clipper"; \
@@ -2423,6 +2451,14 @@
                min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
                max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
                image.normal: image_normal; \
+               rel1 { \
+                  relative: 1.0 1.0; \
+                  to: "left_top_padding"; \
+               } \
+               rel2 { \
+                  relative: 0.0 0.0; \
+                  to: "right_bottom_padding"; \
+               } \
             } \
             description { state: "clicked" 0.0; \
                inherit: "default"; \
@@ -2690,12 +2726,47 @@
                image.normal: "00_circle_button_dim.png";
             }
          }
+         part { name: "left_top_padding";
+            scale: 1;
+            type: SPACER;
+            description { state: "default" 0.0;
+               min: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC;
+               max: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC;
+               fixed: 1 1;
+               align: 0.0 0.0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+            }
+         }
+         part { name: "right_bottom_padding";
+            scale: 1;
+            type: SPACER;
+            description { state: "default" 0.0;
+               min: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC;
+               max: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC;
+               fixed: 1 1;
+               align: 1.0 1.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "button_image";
+               }
+               rel2.to: "button_image";
+            }
+         }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             clip_to: "icon_clipper";
             scale: 1;
             description { state: "default" 0.0;
                fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "left_top_padding";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "right_bottom_padding";
+               }
                visible: 0;
             }
             description { state: "visible" 0.0;

diff --git a/themes/widgets/colorselector.edc b/themes/widgets/colorselector.edc
index 6e8cf89..ec1bf24 100644 (file)
--- a/themes/widgets/colorselector.edc
+++ b/themes/widgets/colorselector.edc
@@ -605,7 +605,7 @@ group{
 group{
    name: "elm/colorselector/arrow/default";
    images{
-      image:"00_color_picker_focus.png" COMP;
+      image:"00_color_picker_handler.png" COMP;
    }
    parts{
       part{
@@ -615,7 +615,7 @@ group{
          mouse_events: 1;
          description{
             state: "default" 0.0;
-            image.normal: "00_color_picker_focus.png";
+            image.normal: "00_color_picker_handler.png";
          }
       }
    }