[Elm_datetime] Timepicker dark theme UX v0.5 is implemented.
[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / entry.edc
index 63a9912..fb57d33 100644 (file)
 #define ENTRY_BLOCK_HANDLE_SOURCE10 "elm/entry/selection/block_handle_edge_left"
 #define ENTRY_BLOCK_HANDLE_SOURCE11 "elm/entry/selection/block_handle_edge_right"
 
+#define ENTRY_FOCUS_DATA \
+   data.item: "focus_highlight" "on";
+
+#define ENTRY_EDITFIELD_FOCUS_DATA \
+   data.item: "focus_highlight" "off";
+
+#define ENTRY_FOCUS_IMAGE \
+   images { \
+      image: "00_focus.png" COMP; \
+   }
+
+#define ENTRY_EDITFIELD_FOCUS_IMAGE \
+   images { \
+      image: "00_edit_field_focus.png" COMP; \
+      image: "00_eidt_field_bg.png" COMP; \
+   }
+
+#define ENTRY_TEXTBLOCK_DEFAULT_REL \
+   rel1 { \
+      to_x: "focus_left_padding"; \
+      relative: 1.0 0.0; \
+   } \
+   rel2 { \
+      to_x: "editfield_space"; \
+      relative: 0.0 1.0; \
+   }
+
+#define ENTRY_SWALLOW_SCRIPT_PUBLIC \
+   script { \
+      public scroll_enabled; \
+   }
+
+#define ENTRY_SWALLOW_PARTS \
+   part { name: "editfield_space"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         align: 1.0 0.5; \
+         min: 0 0; \
+         max: 0 0; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "rename_visible" 0.0; \
+         inherit: "default" 0.0; \
+         min: 9 0; \
+         max: 9 0; \
+         rel1 { \
+            to_x: "elm.swallow.rename"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "elm.swallow.rename"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "clear_visible" 0.0; \
+         inherit: "default" 0.0; \
+         min: 9 0; \
+         max: 9 0; \
+         rel1 { \
+            to_x: "elm.swallow.clear"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "elm.swallow.clear"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+   } \
+   part { name: "elm.swallow.clear"; \
+      type: SWALLOW; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         align: 1.0 0.5; \
+         fixed: 1 1; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
+         visible: 0; \
+      } \
+      description { state: "visible" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   } \
+   part { name: "elm.swallow.rename"; \
+      type: SWALLOW; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         align: 1.0 0.5; \
+         fixed: 1 1; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
+         visible: 0; \
+      } \
+      description { state: "visible" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   }
+
+#define ENTRY_FOCUS_PARTS \
+   part { name: "focus_bg"; \
+      type: RECT; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         rel1.relative: 0.0 0.0; \
+         rel2.relative: 1.0 1.0; \
+      } \
+   } \
+   part { name: "focus_left_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         fixed: 1 0; \
+         align: 0.0 0.5; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 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; \
+         fixed: 1 0; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_image"; \
+      scale: 1; \
+      mouse_events: 0; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         image { \
+            normal: "00_focus.png"; \
+            border: 6 6 6 6; \
+            border_scale: 1; \
+         } \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   }
+
+#define ENTRY_EDITFIELD_FOCUS_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_edit_field_bg.png"; \
+            border: 8 8 8 8; \
+            border_scale: 1; \
+         } \
+         rel1.relative: 0.0 0.0; \
+         rel2.relative: 1.0 1.0; \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 0; \
+      } \
+   } \
+   part { name: "focus_left_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         fixed: 1 0; \
+         align: 0.0 0.5; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 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; \
+         fixed: 1 0; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_image"; \
+      scale: 1; \
+      mouse_events: 0; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         image { \
+            normal: "00_edit_field_focus.png"; \
+            border: 8 8 8 8; \
+            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; \
+      } \
+   }
+
+#define ENTRY_SWALLOW_PROGRAMS \
+   program { name: "scroll_enabled"; \
+      signal: "elm,state,scroll,enabled"; \
+      source: "*"; \
+      script { \
+         set_int(scroll_enabled, 1); \
+         set_state(PART:"focus_bg", "hidden", 0.0); \
+         set_state(PART:"focus_left_padding", "hidden", 0.0); \
+         set_state(PART:"focus_right_padding", "hidden", 0.0); \
+      } \
+   } \
+   program { name: "scroll_disabled"; \
+      signal: "elm,state,scroll,disabled"; \
+      source: "*"; \
+      script { \
+         set_int(scroll_enabled, 0); \
+         set_state(PART:"focus_bg", "default", 0.0); \
+         set_state(PART:"focus_left_padding", "default", 0.0); \
+         set_state(PART:"focus_right_padding", "default", 0.0); \
+      } \
+   } \
+   program { name: "clear_show"; \
+      signal: "elm,state,clear,visible"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"elm.swallow.clear", "visible", 0.0); \
+            set_state(PART:"editfield_space", "clear_visible", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "clear_hide"; \
+      signal: "elm,state,clear,hidden"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"elm.swallow.clear", "default", 0.0); \
+            set_state(PART:"editfield_space", "default", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "rename_show"; \
+      signal: "elm,state,rename,visible"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"elm.swallow.rename", "visible", 0.0); \
+            set_state(PART:"editfield_space", "rename_visible", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "rename_hide"; \
+      signal: "elm,state,rename,hidden"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"elm.swallow.rename", "default", 0.0); \
+            set_state(PART:"editfield_space", "default", 0.0); \
+         } \
+      } \
+   }
+
+#define ENTRY_FOCUS_PROGRAMS \
+   program { name: "action_focus"; \
+      signal: "elm,action,focus_highlight,show"; \
+      source: "elm"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "focused", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "action_unfocus"; \
+      signal: "elm,action,focus_highlight,hide"; \
+      source: "elm"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "default", 0.0); \
+         } \
+      } \
+   }
+
+#define ENTRY_EDITFIELD_FOCUS_PROGRAMS \
+   program { name: "action_focus"; \
+      signal: "elm,state,focus,on"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "focused", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "action_unfocus"; \
+      signal: "elm,state,focus,off"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "default", 0.0); \
+         } \
+      } \
+   }
+
 sounds {
    sample {
       name: "touch_sound" AS_IS;
@@ -51,7 +461,7 @@ group { name: "elm/entry/base/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 left_margin=1 right_margin=2 wrap=mixed text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" left_margin=1 right_margin=2 wrap=mixed text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -80,7 +490,10 @@ group { name: "elm/entry/base/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -125,6 +538,7 @@ group { name: "elm/entry/base/default";
                min: 0 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -134,7 +548,9 @@ group { name: "elm/entry/base/default";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -171,6 +587,8 @@ group { name: "elm/entry/base/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -197,7 +615,7 @@ group { name: "elm/entry/base-charwrap/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -226,7 +644,10 @@ group { name: "elm/entry/base-charwrap/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -271,6 +692,7 @@ group { name: "elm/entry/base-charwrap/default";
                min: 0 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -280,7 +702,9 @@ group { name: "elm/entry/base-charwrap/default";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
         program { name: "focus";
         signal: "load";
@@ -317,6 +741,8 @@ group { name: "elm/entry/base-charwrap/default";
         source: "elm.text";
         action: PLAY_SAMPLE "touch_sound" 1.0;
      }
+     ENTRY_SWALLOW_PROGRAMS
+     ENTRY_FOCUS_PROGRAMS
   }
 }
 
@@ -327,7 +753,10 @@ group { name: "elm/entry/base-nowrap/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -370,6 +799,7 @@ group { name: "elm/entry/base-nowrap/default";
                min: 1 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -379,7 +809,9 @@ group { name: "elm/entry/base-nowrap/default";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -416,6 +848,8 @@ group { name: "elm/entry/base-nowrap/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -448,7 +882,7 @@ group { name: "elm/entry/base/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -464,7 +898,7 @@ group { name: "elm/entry/base/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -477,7 +911,10 @@ group { name: "elm/entry/base/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -522,6 +959,7 @@ group { name: "elm/entry/base/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -531,7 +969,9 @@ group { name: "elm/entry/base/editfield";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -568,6 +1008,8 @@ group { name: "elm/entry/base/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -599,7 +1041,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -615,7 +1057,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_textblock_char_wrap_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -628,7 +1070,10 @@ group { name: "elm/entry/base-charwrap/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -673,6 +1118,7 @@ group { name: "elm/entry/base-charwrap/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -682,7 +1128,9 @@ group { name: "elm/entry/base-charwrap/editfield";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -719,6 +1167,8 @@ group { name: "elm/entry/base-charwrap/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -749,7 +1199,7 @@ group { name: "elm/entry/base-single/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_single_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -765,7 +1215,7 @@ group { name: "elm/entry/base-single/editfield";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "editfield_single_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_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";
@@ -778,7 +1228,10 @@ group { name: "elm/entry/base-single/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -821,6 +1274,7 @@ group { name: "elm/entry/base-single/editfield";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -829,7 +1283,9 @@ group { name: "elm/entry/base-single/editfield";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -866,6 +1322,8 @@ group { name: "elm/entry/base-single/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -876,7 +1334,54 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   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="ENTRY_DISABLED_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=#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";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -885,7 +1390,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;
             }
@@ -915,19 +1420,22 @@ 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;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_single_textblock_disabled_style";
+               style: "editfield_searchbar_single_textblock_disabled_style";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -964,6 +1472,8 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -989,7 +1499,7 @@ group { name: "elm/entry/base-single/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_single_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1015,10 +1525,13 @@ group { name: "elm/entry/base-single/default";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    data {
       item: context_menu_orientation "horizontal";
    }
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1063,6 +1576,7 @@ group { name: "elm/entry/base-single/default";
                max: 0 0;
                align: 0.0 0.5;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1071,7 +1585,9 @@ group { name: "elm/entry/base-single/default";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1108,6 +1624,8 @@ group { name: "elm/entry/base-single/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -1508,7 +2026,10 @@ group { name: "elm/entry/base-noedit/default";
       data {
          item: context_menu_orientation "horizontal";
       }
+      ENTRY_FOCUS_DATA
+      ENTRY_FOCUS_IMAGE
       parts {
+         ENTRY_FOCUS_PARTS
          part { name: "elm.guide";
             type: TEXTBLOCK;
             mouse_events: 0;
@@ -1548,10 +2069,11 @@ group { name: "elm/entry/base-noedit/default";
            description { state: "default" 0.0;
               text {
                  style: "entry_single_textblock_style";
-                 repch: "*";
+                 repch: "•";
                  min: 1 1;
                   max: 0 1;
               }
+               ENTRY_TEXTBLOCK_DEFAULT_REL
            }
            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -1560,7 +2082,9 @@ group { name: "elm/entry/base-noedit/default";
               }
            }
         }
+         ENTRY_SWALLOW_PARTS
       }
+      ENTRY_SWALLOW_SCRIPT_PUBLIC
       programs {
         program { name: "focus";
             signal: "load";
@@ -1597,6 +2121,8 @@ group { name: "elm/entry/base-noedit/default";
             source: "elm.text";
             action: PLAY_SAMPLE "touch_sound" 1.0;
          }
+         ENTRY_SWALLOW_PROGRAMS
+         ENTRY_FOCUS_PROGRAMS
       }
    }
 
@@ -1626,7 +2152,7 @@ group { name: "elm/entry/base-password/popup";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_single_textblock_disabled_popup_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 align=center wrap=mixed ellipsis=1.0 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" align=center wrap=mixed ellipsis=1.0 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1652,7 +2178,10 @@ group { name: "elm/entry/base-password/popup";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1692,10 +2221,11 @@ group { name: "elm/entry/base-password/popup";
          description { state: "default" 0.0;
             text {
                style: "entry_single_textblock_popup_style";
-               repch: "*";
+               repch: "•";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1704,7 +2234,9 @@ group { name: "elm/entry/base-password/popup";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1741,6 +2273,8 @@ group { name: "elm/entry/base-password/popup";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -1879,7 +2413,7 @@ group { name: "elm/entry/base-password/popup";
                                        max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
                                        color: 0 0 0 0;
                                        visible: 0;
-                                       align: 1 0;
+                                       align: 0 0;
                                }
                        }
                        part { name: "handle";
@@ -1889,6 +2423,7 @@ group { name: "elm/entry/base-password/popup";
                                        visible: 0;
                                        fixed: 1 1;
                                        align: 1 0;
+                                       rel2 { relative: 1 1; to_x: "edge"; }
                                        min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
                                        max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
                                        image {
@@ -1906,6 +2441,7 @@ group { name: "elm/entry/base-password/popup";
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        align: 1 1;
+                                       rel2 { relative: 1 1; to_x: "edge"; }
                                        image {
                                                normal: "copy&paste_Handler_left.png";
                                        }
@@ -2254,7 +2790,7 @@ group { name: "elm/entry/base-password/popup";
                                        min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
                                        max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
                                        rel2 { relative: 0 1; to_x: "align"; }
-                                       align: 1 0;
+                                       align: 0 0;
                                        visible: 0;
                                }
                                description { state: "show" 0.0;
@@ -4170,6 +4706,157 @@ styles {
       }
    }
 
+group { name: "elm/entry/base-single/multibuttonentry";
+
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+
+   styles {
+      style { name: "multibuttonentry_single_textblock_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         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;
+         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: "multibuttonentry_single_textblock_disabled_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         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=#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;
+         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: "multibuttonentry_single_textblock_guide_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen 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";
+      }
+   }
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
+   parts {
+      ENTRY_FOCUS_PARTS
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "multibuttonentry_single_textblock_guide_style";
+               min: 0 1;
+               max: 0 1;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: BLOCK_HANDLE;
+         //cursor_mode: BEFORE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         //source2: "X"; // selection over
+         //source3: "X"; // cursor under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
+         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
+         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
+         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
+         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
+         description { state: "default" 0.0;
+            text {
+               style: "multibuttonentry_single_textblock_style";
+               min: 1 1;
+               max: 0 1;
+            }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "multibuttonentry_single_textblock_disabled_style";
+            }
+         }
+      }
+      ENTRY_SWALLOW_PARTS
+   }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   programs {
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
+   }
+}
 group { name: "elm/entry/base/font_color_black";
    alias: "elm/entry/base-mixedwrap/font_color_black";
    alias: "elm/entry/base/font_color_black/default";
@@ -4185,7 +4872,7 @@ group { name: "elm/entry/base/font_color_black";
 
    styles {
       style { name: "font_color_black_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4201,7 +4888,7 @@ group { name: "elm/entry/base/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4217,7 +4904,7 @@ group { name: "elm/entry/base/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4230,7 +4917,10 @@ group { name: "elm/entry/base/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4274,6 +4964,7 @@ group { name: "elm/entry/base/font_color_black";
                style: "font_color_black_textblock_style";
                min: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4283,7 +4974,9 @@ group { name: "elm/entry/base/font_color_black";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4320,6 +5013,8 @@ group { name: "elm/entry/base/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4438,7 +5133,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
 
    styles {
       style { name: "font_color_black_textblock_char_wrap_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4454,7 +5149,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4470,7 +5165,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_textblock_char_wrap_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4483,7 +5178,10 @@ group { name: "elm/entry/base-charwrap/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4527,6 +5225,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
                style: "font_color_black_textblock_char_wrap_style";
                min: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4536,7 +5235,9 @@ group { name: "elm/entry/base-charwrap/font_color_black";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4573,6 +5274,8 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4591,7 +5294,7 @@ group { name: "elm/entry/base-single/font_color_black";
 
    styles {
       style { name: "font_color_black_single_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4607,7 +5310,7 @@ group { name: "elm/entry/base-single/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_single_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4623,7 +5326,7 @@ group { name: "elm/entry/base-single/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_single_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4636,7 +5339,10 @@ group { name: "elm/entry/base-single/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4679,6 +5385,7 @@ group { name: "elm/entry/base-single/font_color_black";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4687,7 +5394,9 @@ group { name: "elm/entry/base-single/font_color_black";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4724,6 +5433,8 @@ group { name: "elm/entry/base-single/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4828,7 +5539,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
    inherit: "elm/entry/base-single/font_color_black";
    styles {
       style { name: "tizen_text_class_single_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4844,7 +5555,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "tizen_text_class_single_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4860,7 +5571,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "tizen_text_class_single_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4894,6 +5605,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
             text {
                style: "tizen_text_class_single_textblock_style";
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4912,7 +5624,10 @@ group { name: "elm/entry/base-password/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4951,10 +5666,11 @@ group { name: "elm/entry/base-password/font_color_black";
          description { state: "default" 0.0;
             text {
                style: "font_color_black_single_textblock_style";
-               repch: "*";
+               repch: "•";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4963,7 +5679,9 @@ group { name: "elm/entry/base-password/font_color_black";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5000,15 +5718,18 @@ group { name: "elm/entry/base-password/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
 group { name: "elm/scroller/entry/default";
-      alias : "elm/scroller/entry/editfield";
-      alias : "elm/scroller/entry/editfield/searchbar/default";
       data {
          item: "focus_highlight" "on";
       }
+      images {
+         image: "00_focus.png" COMP;
+      }
       script {
          public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
          public timer0(val) {
@@ -5034,78 +5755,251 @@ group { name: "elm/scroller/entry/default";
          }
       }
       parts {
-         part { name: "bg";
+         part { name: "focus_bg";
             type: RECT;
+            scale: 1;
             description { state: "default" 0.0;
                visible: 0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
             }
          }
-         part { name: "clipper";
-            type: RECT;
+         part { name: "focus_image";
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+               visible: 0;
+               image {
+                  normal: "00_focus.png";
+                  border: 6 6 6 6;
+                  border_scale: 1;
+               }
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
             }
-         }
-         part { name: "contentclipper";
-            type: RECT;
-            mouse_events: 0;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               rel1.to: "elm.swallow.icon";
-               rel1.relative: 1.0 0.0;
-               rel2.to: "elm.swallow.end";
-               rel2.relative: 0.0 1.0;
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "elm.swallow.icon";
-            type: SWALLOW;
-            clip_to: "clipper";
+         part { name: "focus_left_padding";
+            type: SPACER;
+            scale: 1;
             description { state: "default" 0.0;
-               fixed: 1 1;
+               min: 10 0;
+               max: 10 0;
+               align: 0.0 0.5;
+               fixed: 1 0;
                rel1 {
-                  to: "bg";
+                  to: "focus_bg";
                   relative: 0.0 0.0;
                }
                rel2 {
-                  to: "bg";
+                  to: "focus_bg";
                   relative: 0.0 1.0;
                }
-               visible: 0;
             }
-            description { state: "visible" 0.0;
-               fixed: 1 1;
-               align: 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;
+               fixed: 1 0;
                rel1 {
-                         to: "bg";
-                         relative: 0.0 0.0;
+                  to: "focus_bg";
+                  relative: 1.0 0.0;
                }
                rel2 {
-                  to: "bg";
-                  relative: 0.0 1.0;
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
                }
-               visible: 1;
             }
          }
-         part { name: "elm.swallow.end";
-            type: SWALLOW;
-            clip_to: "clipper";
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
             description { state: "default" 0.0;
-               fixed: 1 1;
+               visible: 0;
                rel1 {
-                  to: "bg";
+                  to_x: "focus_left_padding";
                   relative: 1.0 0.0;
                }
                rel2 {
+                  to_x: "focus_right_padding";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "clipper";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+         }
+         part { name: "editfield_space";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               min: 0 0;
+               max: 0 0;
+               rel1.to: "elm.swallow.end";
+               rel1.relative: 0.0 0.0;
+               rel2.to: "elm.swallow.end";
+               rel2.relative: 1.0 1.0;
+            }
+            description { state: "rename_visible" 0.0;
+               inherit: "default" 0.0;
+               min: 9 0;
+               max: 9 0;
+               rel1 {
+                  to_x: "elm.swallow.rename";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.rename";
+                  relative: 0.0 1.0;
+               }
+            }
+            description { state: "clear_visible" 0.0;
+               inherit: "default" 0.0;
+               min: 9 0;
+               max: 9 0;
+               rel1 {
+                  to_x: "elm.swallow.clear";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.clear";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "contentclipper";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               rel1.to: "icon_right_padding";
+               rel1.relative: 1.0 0.0;
+               rel2.to: "editfield_space";
+               rel2.relative: 0.0 1.0;
+            }
+         }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               align: 0.0 0.5;
+               fixed: 1 1;
+               rel1 {
                   to: "bg";
-                  relative: 1.0 1.0;
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "bg";
+                  relative: 0.0 1.0;
                }
                visible: 0;
             }
             description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "icon_right_padding";
+            type: SPACER;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.0 0.0;
+               min: 0 0;
+               max: 0 0;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: 8 0;
+               max: 8 0;
+            }
+         }
+         part { name: "elm.swallow.clear";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               fixed: 1 1;
+               rel1 {
+                  to_x: "elm.swallow.end";
+                  to_y: "bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  to_y: "bg";
+                  relative: 0.0 1.0;
+               }
+               visible: 0;
+            }
+            description { state: "clear_visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.rename";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               fixed: 1 1;
+               rel1 {
+                  to_x: "elm.swallow.end";
+                  to_y: "bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  to_y: "bg";
+                  relative: 0.0 1.0;
+               }
+               visible: 0;
+            }
+            description { state: "rename_visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.end";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
                fixed: 1 1;
-               align: 1.0 1.0;
                rel1 {
                   to: "bg";
                   relative: 1.0 0.0;
@@ -5114,25 +6008,31 @@ group { name: "elm/scroller/entry/default";
                   to: "bg";
                   relative: 1.0 1.0;
                }
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
                visible: 1;
             }
          }
          part { name: "elm.swallow.content";
             clip_to: "contentclipper";
+            scale: 1;
             type: SWALLOW;
             description { state: "default" 0.0;
                rel1 {
-                       to: "elm.swallow.icon";
+                       to_x: "icon_right_padding";
                        relative: 1.0 0.0;
                }
                rel2 {
-                to: "elm.swallow.end";
+                to_x: "editfield_space";
                 relative: 0.0 1.0;
                }
             }
          }
          part { name: "sb_vbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5144,6 +6044,7 @@ group { name: "elm/scroller/entry/default";
          part { name: "sb_vbar_clip";
             clip_to: "sb_vbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5154,6 +6055,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "sb_vbar";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
@@ -5163,17 +6065,18 @@ group { name: "elm/scroller/entry/default";
                rel1 {
                   relative: 0.0 0.0;
                   to_y:     "elm.swallow.content";
-                  to_x:     "elm.swallow.end";
+                  to_x:     "editfield_space";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_y:     "sb_hbar";
-                  to_x:     "elm.swallow.end";
+                  to_x:     "editfield_space";
                }
             }
          }
          part { name: "elm.dragable.vbar";
             type: RECT;
+            scale: 1;
             clip_to: "sb_vbar_clip";
             mouse_events: 0;
             dragable {
@@ -5198,6 +6101,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "sb_hbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5209,6 +6113,7 @@ group { name: "elm/scroller/entry/default";
          part { name: "sb_hbar_clip";
             clip_to: "sb_hbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5219,6 +6124,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "sb_hbar";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
@@ -5239,6 +6145,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "elm.dragable.hbar";
             type: RECT;
+            scale: 1;
             clip_to: "sb_hbar_clip";
             mouse_events: 0;
             dragable {
@@ -5280,12 +6187,42 @@ group { name: "elm/scroller/entry/default";
             source: "elm";
             action: STATE_SET "visible" 0.0;
             target: "elm.swallow.icon";
+            target: "icon_right_padding";
          }
          program { name: "icon_hide";
             signal: "elm,action,hide,icon";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.icon";
+            target: "icon_right_padding";
+         }
+         program { name: "clear_show";
+            signal: "elm,state,clear,visible";
+            source: "*";
+            action: STATE_SET "clear_visible" 0.0;
+            target: "elm.swallow.clear";
+            target: "editfield_space";
+         }
+         program { name: "clear_hide";
+            signal: "elm,state,clear,hidden";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.clear";
+            target: "editfield_space";
+         }
+         program { name: "rename_show";
+            signal: "elm,state,rename,visible";
+            source: "*";
+            action: STATE_SET "rename_visible" 0.0;
+            target: "elm.swallow.rename";
+            target: "editfield_space";
+         }
+         program { name: "rename_hide";
+            signal: "elm,state,rename,hidden";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.rename";
+            target: "editfield_space";
          }
          program { name: "end_show";
             signal: "elm,action,show,end";
@@ -5436,5 +6373,316 @@ group { name: "elm/scroller/entry/default";
                set_int(sbvis_timer, v);
             }
          }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
+      }
+   }
+group { name: "elm/scroller/entry/editfield";
+      inherit: "elm/scroller/entry/default";
+      data {
+         item: "focus_highlight" "off";
+      }
+      images {
+         image: "00_edit_field_focus.png" COMP;
+         image: "00_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_edit_field_bg.png";
+                  border: 8 8 8 8;
+                  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_edit_field_focus.png";
+                  border: 8 8 8 8;
+                  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;
+               fixed: 1 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;
+               fixed: 1 0;
+               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";
+         }
+      }
+}
+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;
+               fixed: 1 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;
+               fixed: 1 0;
+               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";
+         }
+      }
+}
+group { name: "elm/entry/base-single/datetime_popup";
+   name: "elm/entry/base-single/datetime_popup/year";
+   alias: "elm/entry/base-single/datetime_popup/month";
+   alias: "elm/entry/base-single/datetime_popup/date";
+   alias: "elm/entry/base-single/datetime_popup/hour";
+   alias: "elm/entry/base-single/datetime_popup/minute";
+
+   inherit: "elm/entry/base-single/default";
+
+   data.item: "default_font_size" "64";
+
+   styles {
+      style { name: "entry_datetime_popup_textblock_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_DATETIME_POPUP_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         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;
       }
    }
+   parts {
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: BLOCK_HANDLE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
+         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
+         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
+         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
+         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
+         description { state: "default" 0.0;
+            text {
+               style: "entry_datetime_popup_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_disabled_style";
+            }
+         }
+      }
+   }
+}
+
+