[entry] Apply dark theme to search bar editfield

Change-Id: I6b7413d6fbc8ad6b41b78ae585d3cbb7196f4c9e

diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg.png b/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg.png
index 6c671f4..8424339 100644 (file)
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg.png and b/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg.png differ

diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg_focus.png b/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg_focus.png
index d147537..836ae1b 100644 (file)
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg_focus.png and b/themes/images/HD/dark/GUI_Style_Guide/00_search_edit_field_bg_focus.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 727e07f..5b3badd 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -601,8 +601,8 @@
 #define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0
 
 #define BUTTON_SEARCH_ICON_MIN_MAX_INC 45 45
-#define BUTTON_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
-#define BUTTON_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
+#define BUTTON_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255
+#define BUTTON_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 93 97 118 128
 
 #define BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC 54 54
 #define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DEFAULT_COLOR_INC 72 93 147 255
@@ -617,6 +617,9 @@
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 72 93 147 128
 
 #define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 42 57 172 255
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 93 97 118 128
 
 #define BUTTON_JUMP_STYLE_BG_MIN_INC 74 74
 #define BUTTON_JUMP_ICON_NORMAL_COLOR_INC 250 250 250 255
@@ -806,8 +809,8 @@
 #define SEARCHBAR_BOTTOM_PADDING_INC 10
 #define SEARCHBAR_HEIGHT_INC 66
 #define SEARCHBAR_WIDTH_INC 120
-#define SEARCHBAR_LEFT_PADDING_INC 26
-#define SEARCHBAR_RIGHT_PADDING_INC 26
+#define SEARCHBAR_LEFT_PADDING_INC 16
+#define SEARCHBAR_RIGHT_PADDING_INC 16
 #define SEARCHBAR_INPUTFIELD_BORDER_INC 12 13 12 13
 #define SEARCHBAR_LEFT_ICON_PADDING_INC 0
 #define SEARCHBAR_ICON_MIN_W_INC 44
@@ -944,8 +947,8 @@
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#FAFAFA"
-#define ENTRY_GUIDE_TEXT_COLOR_INC "#485D93"
-#define ENTRY_CURSOR_COLOR_INC 59 115 182 255
+#define ENTRY_GUIDE_TEXT_COLOR_INC "#5D6176"
+#define ENTRY_CURSOR_COLOR_INC 58 114 255 255
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
 #define ENTRY_PREEDIT_TEXT_COLOR_INC "#FFFFFF"
 #define ENTRY_PREEDIT_UNDERLINE_COLOR_INC "#000000"
@@ -961,6 +964,8 @@
 #define MAGNIFIER_HEIGHT_FIXED 134
 #define MAGNIFIER_WIDTH_FIXED 312
 
+#define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
+
 #define ENTRY_BUBBLE_EX_PAD 58
 #define ENTRY_BUBBLE_EX_CALLERID_PAD 178
 #define ENTRY_BUBBLE_IX_PAD 20

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 9c2835a..398871d 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -647,6 +647,9 @@
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
 
 #define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 45 45
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
+#define BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76
 
 #define BUTTON_JUMP_STYLE_BG_MIN_INC 72 72
 #define BUTTON_JUMP_ICON_NORMAL_COLOR_INC 58 58 58 255
@@ -990,6 +993,8 @@
 #define MAGNIFIER_HEIGHT_FIXED 134
 #define MAGNIFIER_WIDTH_FIXED 312
 
+#define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
+
 #define ENTRY_BUBBLE_EX_PAD 58
 #define ENTRY_BUBBLE_EX_CALLERID_PAD 178
 #define ENTRY_BUBBLE_IX_PAD 20

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 17de13c..2b58a8e 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -8172,6 +8172,9 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png")
 
    group { name: "elm/button/base/search_clear";
       inherit: "elm/button/base/editfield_clear";
+      images {
+         image: "00_field_btn_clear.png" COMP;
+      }
       parts {
          part { name: "clear_button";
             scale: 1;
@@ -8182,7 +8185,19 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png")
                max: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC;
                fixed: 1 1;
                align: 0.5 0.5;
-               image.normal: "00_edit_field_clear.png";
+               image.normal: "00_field_btn_clear.png";
+            }
+         }
+         part { name: "clear_button.clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
       }

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 76acb1b..68a5370 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -1332,6 +1332,50 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    }
    ENTRY_FOCUS_DATA
    ENTRY_FOCUS_IMAGE
+   styles {
+      style { name: "editfield_searchbar_single_textblock_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "editfield_searchbar_single_textblock_disabled_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "editfield_searchbar_single_textblock_guide_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+      }
+   }
    parts {
       ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
@@ -1342,7 +1386,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_single_textblock_guide_style";
+               style: "editfield_searchbar_single_textblock_guide_style";
                min: 0 1;
                max: 0 1;
             }
@@ -1372,7 +1416,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             text {
-               style: "editfield_single_textblock_style";
+               style: "editfield_searchbar_single_textblock_style";
                min: 1 1;
                max: 0 1;
             }
@@ -1381,7 +1425,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_single_textblock_disabled_style";
+               style: "editfield_searchbar_single_textblock_disabled_style";
             }
          }
       }
@@ -5525,8 +5569,6 @@ group { name: "elm/entry/base-password/font_color_black";
 }
 
 group { name: "elm/scroller/entry/default";
-      alias : "elm/scroller/entry/editfield";
-      alias : "elm/scroller/entry/editfield/searchbar/default";
       data {
          item: "focus_highlight" "on";
       }
@@ -6303,6 +6345,121 @@ group { name: "elm/scroller/entry/editfield";
          }
       }
 }
+group { name: "elm/scroller/entry/editfield/searchbar/default";
+      inherit: "elm/scroller/entry/default";
+      data {
+         item: "focus_highlight" "off";
+      }
+      images {
+         image: "00_search_edit_field_bg_focus.png" COMP;
+         image: "00_search_edit_field_bg.png" COMP;
+      }
+      parts {
+         part { name: "focus_bg";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "00_search_edit_field_bg.png";
+                  border: 12 13 12 13;
+                  border_scale: 1;
+               }
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "00_search_edit_field_bg_focus.png";
+                  border: 12 13 12 13;
+                  border_scale: 1;
+               }
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "focus_left_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "focus_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 1.0 0.5;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "focus_right_padding";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+      }
+      programs {
+         program { name: "action_focus";
+            signal: "elm,state,focus,on";
+            source: "*";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,state,focus,off";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
+      }
+}
 
 
 

diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc
index 3acd6e5..83861d9 100644 (file)
--- a/themes/widgets/layout.edc
+++ b/themes/widgets/layout.edc
@@ -1157,15 +1157,14 @@ group { name: "elm/layout/searchbar/default";
    }
    parts {
       part { name: "inputfield_base";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            visible: 0;
          }
       }
       part { name: "top_left_padding";
-         type: RECT;
+         type: SPACER;
          mouse_events: 0;
          scale: 1;
          description {
@@ -1175,11 +1174,10 @@ group { name: "elm/layout/searchbar/default";
             align: 0.0 0.0;
             rel1 { relative: 0.0 0.0; to: "inputfield_base"; }
             rel2 { relative: 0.0 0.0; to: "inputfield_base"; }
-            visible: 0;
          }
       }
       part { name: "bottom_right_padding";
-         type: RECT;
+         type: SPACER;
          mouse_events: 0;
          scale: 1;
          description {
@@ -1189,265 +1187,18 @@ group { name: "elm/layout/searchbar/default";
             align: 1.0 1.0;
             rel1 { relative: 1.0 1.0; to: "inputfield_base"; }
             rel2 { relative: 1.0 1.0; to: "inputfield_base"; }
-            visible: 0;
          }
       }
       part { name: "inputfield_rect";
-         type: IMAGE;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
             min: SEARCHBAR_WIDTH_INC SEARCHBAR_HEIGHT_INC;
             align: 0.0 0.5;
-            image {
-               normal: "00_search_edit_field_bg.png";
-               border: SEARCHBAR_INPUTFIELD_BORDER_INC;
-            }
             rel1 { relative: 1.0 1.0; to: "top_left_padding"; }
             rel2 { relative: 0.0 0.0; to: "bottom_right_padding"; }
          }
       }
-      part { name: "left_padding_search_textfield";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: SEARCHBAR_LEFT_PADDING_SEARCHFIELD_INC 0;
-            fixed: 1 0;
-            align: 0.0 0.5;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "inputfield_rect";
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to: "inputfield_rect";
-            }
-         }
-      }
-      part { name: "right_padding_search_textfield";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: SEARCHBAR_RIGHT_PADDING_SEARCHFIELD_INC 0;
-            fixed: 1 0;
-            align: 1.0 0.5;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "inputfield_rect";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to: "inputfield_rect";
-            }
-         }
-      }
-      part { name: "search_textfield";
-         type: RECT;
-         mouse_events: 1;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-            min: 1 SEARCHBAR_SEARCH_TEXTFIELD_H_INC;
-            fixed: 0 1;
-            align: 0.0 0.5;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "left_padding_search_textfield";
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to: "right_padding_search_textfield";
-            }
-         }
-      }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC;
-            fixed: 1 1;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "search_textfield";
-            }
-            rel2 {
-               relative: 1.0 0.0;
-               to: "search_textfield";
-            }
-            align: 0.5 0;
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP1_MULTI_INC;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP2_INC;
-            fixed: 1 1;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "search_textfield";
-            }
-            rel2 {
-               relative: 1.0 0.0;
-               to: "search_textfield";
-            }
-            align: 0.5 0;
-         }
-      }
-      part { name: "left1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_LEFT1_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "search_textfield";
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-         }
-      }
-      part { name: "left2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_LEFT2_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "search_textfield";
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-         }
-      }
-      part { name: "right2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT2_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "search_textfield";
-            }
-            rel2.to: "search_textfield";
-         }
-      }
-      part { name: "bottom1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC;
-            fixed: 1 1;
-            align: 0 1;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC;
-         }
-      }
-      part { name: "bottom2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC;
-            fixed: 0 1;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-            align: 0 1;
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC;
-         }
-      }
-      part { name: "bottom3";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC;
-            fixed: 0 1;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-            align: 0 1;
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            align: 0.0 0.0;
-            min: 0 32;
-            fixed: 1 1;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            color: EDITFIELD_TITLE_COLOR_INC;
-            text {
-               font: "Tizen:style=Medium";
-               size: EDITFIELD_TITLE_SIZE_INC;
-               min: 1 1;
-               align: 0.0 0.0;
-               text_class: "tizen";
-            }
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
       part {
          name: "elm.swallow.content";
          type: SWALLOW;
@@ -1456,42 +1207,18 @@ group { name: "elm/layout/searchbar/default";
          description { state: "default" 0.0;
             min: 0 40;
             rel1 {
-               relative : 1.0 1.0;
-               to_x: "left1";
-               to_y: "top1";
+               relative : 0.0 0.0;
+               to: "inputfield_rect";
             }
             rel2 {
-               relative : 0.0 0.0;
-               to_x: "right2";
-               to_y: "bottom1";
+               relative : 1.0 1.0;
+               to: "inputfield_rect";
             }
             align: 0.0 0.5;
          }
       }
    }
    programs {
-      program {
-         name: "label_show";
-         signal: "elm,state,title,show";
-         source: "elm";
-         action: STATE_SET "elm.text.show" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "label_hide";
-         signal: "elm,state,title,hide";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
      program {
          name: "bg_clicked";
          signal: "mouse,clicked,1";
@@ -1514,10 +1241,9 @@ group { name: "elm/layout/searchbar/cancel_button";
    }
    parts {
      part { name: "top_padding_rect";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            visible: 0;
             min: 0 SEARCHBAR_TOP_PADDING_INC;
             fixed: 0 1;
             align: 0 0;
@@ -1525,10 +1251,9 @@ group { name: "elm/layout/searchbar/cancel_button";
          }
       }
       part { name: "bottom_padding_rect";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            visible: 0;
             min: 0 SEARCHBAR_BOTTOM_PADDING_INC;
             fixed: 0 1;
             align: 0 1;
@@ -1536,10 +1261,9 @@ group { name: "elm/layout/searchbar/cancel_button";
          }
       }
       part { name: "base_bg";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            visible: 0;
             min: 0 SEARCHBAR_HEIGHT_INC;
             align: 0 0.5;
             fixed: 0 1;
@@ -1554,10 +1278,9 @@ group { name: "elm/layout/searchbar/cancel_button";
          }
       }
       part { name: "left_padding_rect";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            visible: 0;
             min: SEARCHBAR_LEFT_PADDING_INC 0;
             fixed: 1 0;
             align: 0 0;
@@ -1565,10 +1288,9 @@ group { name: "elm/layout/searchbar/cancel_button";
          }
       }
       part { name: "right_padding_rect";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            visible: 0;
             min: SEARCHBAR_RIGHT_PADDING_INC 0;
             fixed: 1 0;
             align: 1.0 0.0;
@@ -1580,11 +1302,11 @@ group { name: "elm/layout/searchbar/cancel_button";
          }
       }
       part { name: "inputfield_rect";
-         type: IMAGE;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.5;
-            min: SEARCHBAR_WIDTH_INC 1;
+            min: SEARCHBAR_WIDTH_INC SEARCHBAR_HEIGHT_INC;
             rel1 {
                relative: 1.0 0.0;
                to_x: "left_padding_rect";
@@ -1595,36 +1317,12 @@ group { name: "elm/layout/searchbar/cancel_button";
                to_x: "right_padding_rect";
                to_y: "base_bg";
             }
-            image {
-               normal: "00_search_edit_field_bg.png";
-               border: SEARCHBAR_INPUTFIELD_BORDER_INC;
-            }
-         }
-      }
-      part {
-         name: "focus_image";
-         mouse_events:1;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            image.normal: "00_search_edit_field_bg_focus.png";
-            image.border: SEARCHBAR_INPUTFIELD_BORDER_INC;
-            image.border_scale: 1;
-            rel1.to: "inputfield_rect";
-            rel2.to: "inputfield_rect";
-         }
-         description {
-            state: "in" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
          }
       }
       part { name: "right_btn_padding_rect";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            visible: 0;
             min: SEARCHBAR_RIGHT_PADDING_INC 0;
             fixed: 1 0;
             align: 0.0 0.0;
@@ -1638,77 +1336,6 @@ group { name: "elm/layout/searchbar/cancel_button";
             min: SEARCHBAR_CANCEL_BUTTON_LEFT_PADDING_INC 0;
          }
       }
-      part { name: "left_icon_padding_rect";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: SEARCHBAR_LEFT_ICON_PADDING_INC 0;
-            fixed: 1 0;
-            align: 0 0;
-            rel1.to: "inputfield_rect";
-            rel2 {
-               relative: 0.0 1.0;
-               to: "inputfield_rect";
-            }
-         }
-      }
-      part { name: "left_padding_search_textfield";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: SEARCHBAR_LEFT_PADDING_SEARCHFIELD_INC 0;
-            fixed: 1 0;
-            align: 0.0 0.5;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "inputfield_rect";
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to: "inputfield_rect";
-            }
-         }
-      }
-      part { name: "right_padding_search_textfield";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: SEARCHBAR_RIGHT_PADDING_SEARCHFIELD_INC 0;
-            fixed: 1 0;
-            align: 1.0 0.5;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "inputfield_rect";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to: "inputfield_rect";
-            }
-         }
-      }
-      part { name: "search_textfield";
-         type: RECT;
-         mouse_events: 1;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 1 SEARCHBAR_SEARCH_TEXTFIELD_H_INC;
-            fixed: 0 1;
-            align: 0.0 0.5;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "left_padding_search_textfield";
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to: "right_padding_search_textfield";
-            }
-         }
-      }
       part { name: "button_cancel";
          type: SWALLOW;
          mouse_events: 1;
@@ -1730,195 +1357,6 @@ group { name: "elm/layout/searchbar/cancel_button";
             }
          }
       }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC;
-            fixed: 1 1;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "search_textfield";
-            }
-            rel2 {
-               relative: 1.0 0.0;
-               to: "search_textfield";
-            }
-            align: 0.5 0;
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP1_MULTI_INC;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_TOP2_INC;
-            fixed: 1 1;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "search_textfield";
-            }
-            rel2 {
-               relative: 1.0 0.0;
-               to: "search_textfield";
-            }
-            align: 0.5 0;
-         }
-      }
-      part { name: "left1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_LEFT1_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "search_textfield";
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-         }
-      }
-      part { name: "left2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_LEFT2_INC 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1 {
-               relative: 0.0 0.0;
-               to: "search_textfield";
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-         }
-      }
-      part { name: "right2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT2_INC 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "search_textfield";
-            }
-            rel2.to: "search_textfield";
-         }
-      }
-      part { name: "bottom1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC;
-            fixed: 1 1;
-            align: 0 1;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-            rel2.to: "search_textfield";
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC;
-         }
-      }
-      part { name: "bottom2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC;
-            fixed: 0 1;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-            rel2.to: "search_textfield";
-            align: 0 1;
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC;
-         }
-      }
-      part { name: "bottom3";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC;
-            fixed: 0 1;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "search_textfield";
-            }
-            rel2.to: "search_textfield";
-            align: 0 1;
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            visible: 0;
-            align: 0.0 0.0;
-            min: 0 34;
-            fixed: 1 1;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "left2";
-               to_y: "top2";
-            }
-            color: EDITFIELD_TITLE_COLOR_INC;
-            text {
-               font: "Tizen:style=Medium";
-               size: EDITFIELD_TITLE_SIZE_INC;
-               min: 1 1;
-               align: 0.0 0.0;
-               text_class: "tizen";
-            }
-         }
-         description { state: "elm.text.show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
       part {
          name: "elm.swallow.content";
          type: SWALLOW;
@@ -1927,14 +1365,12 @@ group { name: "elm/layout/searchbar/cancel_button";
          description { state: "default" 0.0;
             min: 0 40;
             rel1 {
-               relative : 1.0 1.0;
-               to_x: "left1";
-               to_y: "top1";
+               relative : 0.0 0.0;
+               to: "inputfield_rect";
             }
             rel2 {
-               relative : 0.0 0.0;
-               to_x: "right2";
-               to_y: "bottom1";
+               relative : 1.0 1.0;
+               to: "inputfield_rect";
             }
             align: 0.0 0.5;
          }
@@ -1942,28 +1378,6 @@ group { name: "elm/layout/searchbar/cancel_button";
    }
    programs {
       program {
-         name: "label_show";
-         signal: "elm,state,title,show";
-         source: "elm";
-         action: STATE_SET "elm.text.show" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
-         name: "label_hide";
-         signal: "elm,state,title,hide";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-         target: "top1";
-         target: "bottom1";
-         target: "bottom2";
-         target: "bottom3";
-      }
-      program {
          name: "sound_play";
          signal: "mouse,clicked,1";
          source: "elm.text";
@@ -1981,7 +1395,6 @@ group { name: "elm/layout/searchbar/cancel_button";
          action: STATE_SET "in" 0.0;
          target: "right_padding_rect";
          target: "right_btn_padding_rect";
-         target: "focus_image";
          transition: LINEAR 0.3;
       }
       program { name: "cancel_out";
@@ -1990,14 +1403,12 @@ group { name: "elm/layout/searchbar/cancel_button";
          action: STATE_SET "default" 0.0;
          target: "right_padding_rect";
          target: "right_btn_padding_rect";
-         target: "focus_image";
          transition: LINEAR 0.3;
       }
       program { name: "cancel_show";
          signal: "cancel,show";
          source: "";
          action: STATE_SET "in" 0.0;
-         target: "focus_image";
          target: "right_padding_rect";
          target: "right_btn_padding_rect";
       }
@@ -2005,15 +1416,9 @@ group { name: "elm/layout/searchbar/cancel_button";
          signal: "cancel,hide";
          source: "";
          action: STATE_SET "default" 0.0;
-         target: "focus_image";
          target: "right_padding_rect";
          target: "right_btn_padding_rect";
       }
-      program { name: "mouse_click";
-         signal: "mouse,clicked,1";
-         source: "search_icon";
-         action: SIGNAL_EMIT "elm,action,click" "";
-      }
    }
 }