Merge remote-tracking branch '2.4/tizen_2.4' into tizen

Conflicts:
	mobile/HD-inc.edc
	mobile/widgets/button.edc
	mobile/widgets/entry.edc
	mobile/widgets/genlist.edc
	mobile/widgets/radio.edc
	mobile/widgets/slider.edc
	packaging/efl-theme-tizen.spec
	wearable-circle/widgets/button.edc
	wearable-circle/widgets/entry.edc
	wearable-circle/widgets/layout.edc
	wearable-circle/widgets/panel.edc
	wearable-circle/widgets/popup.edc
	wearable-circle/widgets/popup_default.edc
	wearable/widgets/entry.edc

Change-Id: I6eb93cedafbd0f973f43329e12c7883231a169b9

1 files changed, 575 insertions, 164 deletions

diff --git a/mobile/widgets/entry.edc b/mobile/widgets/entry.edc
index 0db71628..f0cf7dae 100644
--- a/mobile/widgets/entry.edc
+++ b/mobile/widgets/entry.edc
@@ -100,9 +100,7 @@ group { name: "elm/entry/emoticon/worried/default"; images.image:
 
 group { name: "elm/entry/base/default";
    alias: "elm/entry/base-mixedwrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    data.item: "focus_highlight" "on";
    styles {
       style { name: "entry_textblock_style";
@@ -113,6 +111,7 @@ group { name: "elm/entry/base/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -126,6 +125,7 @@ group { name: "elm/entry/base/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -139,6 +139,7 @@ group { name: "elm/entry/base/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -259,6 +260,7 @@ group { name: "elm/entry/base/default";
 group { name: "elm/entry/base/vcenter_align";
    alias: "elm/entry/base-mixedwrap/vcenter_align";
    inherit: "elm/entry/base/default";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
@@ -317,9 +319,7 @@ group { name: "elm/entry/base/vcenter_align";
 
 group { name: "elm/entry/base-charwrap/default";
    alias: "elm/entry/base/char_wrap";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    styles {
       style { name: "entry_textblock_char_wrap_style";
          base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
@@ -329,6 +329,7 @@ group { name: "elm/entry/base-charwrap/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -342,6 +343,7 @@ group { name: "elm/entry/base-charwrap/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -355,6 +357,7 @@ group { name: "elm/entry/base-charwrap/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -475,6 +478,7 @@ group { name: "elm/entry/base-charwrap/default";
 group { name: "elm/entry/base-charwrap/vcenter_align";
    alias: "elm/entry/base/vcenter_align";
    inherit: "elm/entry/base-charwrap/default";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
@@ -532,9 +536,7 @@ group { name: "elm/entry/base-charwrap/vcenter_align";
 }
 
 group { name: "elm/entry/base-nowrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -640,6 +642,7 @@ group { name: "elm/entry/base-nowrap/default";
 
 group { name: "elm/entry/base-nowrap/vcenter_align";
    inherit: "elm/entry/base-nowrap/default";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
@@ -697,9 +700,7 @@ group { name: "elm/entry/base-nowrap/vcenter_align";
 
 group { name: "elm/entry/base-single/default";
    alias: "elm/entry/base-single/vcenter_align";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    styles {
       style { name: "entry_single_textblock_style";
          base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
@@ -710,6 +711,7 @@ group { name: "elm/entry/base-single/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -724,6 +726,7 @@ group { name: "elm/entry/base-single/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -738,6 +741,7 @@ group { name: "elm/entry/base-single/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -858,13 +862,10 @@ group { name: "elm/entry/base-single/default";
 
 group { name: "elm/entry/base-single/spinner/default";
    alias: "elm/entry/base-single/spinner/horizontal";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   // FIXME: SamsungNum3L has to be applied.
+   data.item: "default_font_size" "106";
    styles {
       style { name: "entry_single_spinner_textblock_style";
-         base: "font=Tizen:style=Light font_size=106 color=#000000ff align=center";
+         base: "font=TizenSans:style=Light font_size=106 color=#000000ff align=center";
          tag:  "br" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
@@ -872,13 +873,14 @@ group { name: "elm/entry/base-single/spinner/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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: "entry_single_spinner_textblock_focused_style";
-         base: "font=Tizen:style=Light font_size=106 color=#000000ff align=center";
+         base: "font=TizenSans:style=Light font_size=106 color=#000000ff align=center";
          tag:  "br" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
@@ -886,13 +888,14 @@ group { name: "elm/entry/base-single/spinner/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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: "entry_single_spinner_textblock_disabled_style";
-         base: "font=Tizen:style=Light font_size=106 color=#000000a3 align=center";
+         base: "font=TizenSans:style=Light font_size=106 color=#000000a3 align=center";
          tag:  "br" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
@@ -900,13 +903,14 @@ group { name: "elm/entry/base-single/spinner/default";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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: "entry_single_spinner_textblock_guide_style";
-         base: "font=Tizen:style=Light font_size=106 color=#000000a3 align=center";
+         base: "font=TizenSans:style=Light font_size=106 color=#000000a3 align=center";
          tag:  "br" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
@@ -1021,6 +1025,7 @@ group { name: "elm/entry/base-single/spinner/default";
 group { name: "elm/entry/base-single/spinner/vertical";
    alias: "elm/entry/base-single/spinner/vertical_time_picker";
    alias: "elm/entry/base-single/spinner/datetime";
+   data.item: "default_font_size" "106";
    styles {
       style { name: "entry_single_spinner_vertical_textblock_style";
          base: "font=Tizen:style=Light font_size=106 color=#000000ff align=center";
@@ -1031,6 +1036,7 @@ group { name: "elm/entry/base-single/spinner/vertical";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1045,6 +1051,7 @@ group { name: "elm/entry/base-single/spinner/vertical";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1059,6 +1066,7 @@ group { name: "elm/entry/base-single/spinner/vertical";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1073,6 +1081,7 @@ group { name: "elm/entry/base-single/spinner/vertical";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1185,6 +1194,7 @@ group { name: "elm/entry/base-single/spinner/vertical";
 
 group { name: "elm/entry/base-single/spinner/vertical_date_picker";
    inherit: "elm/entry/base-single/spinner/vertical";
+   data.item: "default_font_size" "90";
    styles {
       style { name: "entry_single_spinner_vertical_date_picker_textblock_style";
          base: "font=TizenSans:style=Light font_size=90 color=#000000ff align=center text_class=tizen";
@@ -1195,6 +1205,7 @@ group { name: "elm/entry/base-single/spinner/vertical_date_picker";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1209,6 +1220,7 @@ group { name: "elm/entry/base-single/spinner/vertical_date_picker";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1223,6 +1235,7 @@ group { name: "elm/entry/base-single/spinner/vertical_date_picker";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1237,6 +1250,7 @@ group { name: "elm/entry/base-single/spinner/vertical_date_picker";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1295,9 +1309,7 @@ group { name: "elm/entry/base-single/spinner/vertical_date_picker";
 }
 
 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";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    styles {
       style { name: "multibuttonentry_single_textblock_style";
          base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
@@ -1308,6 +1320,7 @@ group { name: "elm/entry/base-single/multibuttonentry";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1322,6 +1335,7 @@ group { name: "elm/entry/base-single/multibuttonentry";
          tag:  "hilight" "+ font_weight=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_highlight" "+ backing=on backing_color="ENTRY_PREEDIT_HIGHLIGHT_BACKGROUND_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;
@@ -1422,9 +1436,7 @@ group { name: "elm/entry/base-single/multibuttonentry";
 
 group { name: "elm/entry/base-single-noedit/default";
    alias: "elm/entry/base-single-noedit/vcenter_align";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -1526,9 +1538,7 @@ group { name: "elm/entry/base-single-noedit/default";
 }
 
 group { name: "elm/entry/base-noedit/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -1631,6 +1641,7 @@ group { name: "elm/entry/base-noedit/default";
 
 group { name: "elm/entry/base-noedit/vcenter_align";
    inherit: "elm/entry/base-noedit/default";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
@@ -1685,9 +1696,7 @@ group { name: "elm/entry/base-noedit/vcenter_align";
 }
 
 group { name: "elm/entry/base-noedit-charwrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -1790,6 +1799,7 @@ group { name: "elm/entry/base-noedit-charwrap/default";
 
 group { name: "elm/entry/base-noedit-charwrap/vcenter_align";
    inherit: "elm/entry/base-noedit-charwrap/default";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
@@ -1844,9 +1854,7 @@ group { name: "elm/entry/base-noedit-charwrap/vcenter_align";
 }
 
 group { name: "elm/entry/base-noedit-mixedwrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -1949,6 +1957,7 @@ group { name: "elm/entry/base-noedit-mixedwrap/default";
 
 group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
    inherit: "elm/entry/base-noedit-mixedwrap/default";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
@@ -2003,9 +2012,7 @@ group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
 }
 
 group { name: "elm/entry/base-nowrap-noedit/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -2107,6 +2114,7 @@ group { name: "elm/entry/base-nowrap-noedit/default";
 
 group { name: "elm/entry/base-nowrap-noedit/vcenter_align";
    inherit: "elm/entry/base-nowrap-noedit/default";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
@@ -2161,9 +2169,7 @@ group { name: "elm/entry/base-nowrap-noedit/vcenter_align";
 
 group { name: "elm/entry/base-password/default";
    alias: "elm/entry/base-password/vcenter_align";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -2268,7 +2274,6 @@ group { name: "elm/entry/base-password/default";
 }
 
 group { name: "elm/entry/cursor/default";
-   min: 1 0;
    parts {
       part { name: "cursor";
          type: RECT;
@@ -2277,16 +2282,6 @@ group { name: "elm/entry/cursor/default";
          clip_to: "clipper";
          description { state: "default" 0.0;
             min: ENTRY_CURSOR_SIZE_INC;
-            fixed: 1 0;
-            align: 0.5 0.5;
-            rel1 {
-               relative: 0.0  0.0;
-               offset: 0 -2;
-            }
-            rel2 {
-               relative: 0.0  1.0;
-               offset: 0 -2;
-            }
             color: 0 184 230 255; /*(Changeable UI) color_class: "F052";*/
             visible: 0;
          }
@@ -2389,11 +2384,20 @@ group { name: "elm/entry/selection/default";
 }
 
 group { name: "elm/entry/handler/start/default";
+   alias: "elm/entry/selection/block_handle_left";
    data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
    data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC;
    images {
-      image: "copy&paste_handler_left_bottom.png" COMP;
-      image: "copy&paste_handler_left_top.png" COMP;
+      image: "copy&paste_handler_bottom_l.png" COMP;
+      image: "copy&paste_handler_bottom_r.png" COMP;
+      image: "copy&paste_handler_top_l.png" COMP;
+      image: "copy&paste_handler_top_r.png" COMP;
+   }
+   script {
+      public handler_on_top = 0;
+      public handler_focused = 0;
+      public handler_disabled = 0;
+      public handler_zoomed = 0;
    }
    parts {
       part { name: "handle";
@@ -2402,14 +2406,11 @@ group { name: "elm/entry/handler/start/default";
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            align: 0.5 0;
-            rel2.offset: 0 0;
+            align: 1.0 0;
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-            color: 0 184 230 255;
             image {
-               normal: "copy&paste_handler_left_bottom.png";
-               border: 0 0 0 0;
+               normal: "copy&paste_handler_bottom_l.png";
             }
          }
          description { state: "show" 0.0;
@@ -2419,31 +2420,49 @@ group { name: "elm/entry/handler/start/default";
          description { state: "top" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 0.5 1;
+            align: 1.0 1;
             image {
-               normal: "copy&paste_handler_left_top.png";
+               normal: "copy&paste_handler_top_l.png";
             }
          }
          description { state: "bottom_reversed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 0.5 0;
+            align: 0 0;
+            image {
+               normal: "copy&paste_handler_bottom_r.png";
+            }
          }
          description { state: "top_reversed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 0.5 1;
+            align: 0.0 1;
             image {
-               normal: "copy&paste_handler_left_top.png";
+               normal: "copy&paste_handler_top_r.png";
             }
          }
+         description { state: "zoom_show" 0.0;
+            inherit: "show" 0.0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
+         description { state: "zoom_top" 0.0;
+            inherit: "top" 0.0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
+         description { state: "zoom_bottom_reversed" 0.0;
+            inherit: "bottom_reversed" 0.0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
+         description { state: "zoom_top_reversed" 0.0;
+            inherit: "top_reversed" 0.0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
       }
    }
-   script {
-      public handler_ontop;
-      public handler_focused;
-      public handler_disabled;
-   }
    programs {
       program { name: "focused";
          signal: "edje,focus,in";
@@ -2460,57 +2479,195 @@ group { name: "elm/entry/handler/start/default";
             set_state(PART:"handle", "default", 0.0);
          }
       }
-      program { name: "bottom_reversed";
-         signal: "elm,state,bottom,reversed";
+      program { name: "pressed_show";
+         action: STATE_SET "zoom_show" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed_top";
+         action: STATE_SET "zoom_top" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed_bottom_reversed";
+         action: STATE_SET "zoom_bottom_reversed" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed_top_reversed";
+         action: STATE_SET "zoom_top_reversed" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_show";
+         action: STATE_SET "show" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_top";
+         action: STATE_SET "top" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_bottom_reversed";
+         action: STATE_SET "bottom_reversed" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_top_reversed";
+         action: STATE_SET "top_reversed" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed";
+         signal: "mouse,down,1";
+         source: "handle";
+         script {
+            set_int(handler_zoomed, 1);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "show"))
+              {
+                 run_program(PROGRAM:"pressed_show");
+              }
+            else if (!strcmp(st, "top"))
+              {
+                 run_program(PROGRAM:"pressed_top");
+              }
+            else if (!strcmp(st, "bottom_reversed"))
+              {
+                 run_program(PROGRAM:"pressed_bottom_reversed");
+              }
+            else if (!strcmp(st, "top_reversed"))
+              {
+                 run_program(PROGRAM:"pressed_top_reversed");
+              }
+         }
+      }
+      program { name: "released";
+         signal: "mouse,up,1";
+         source: "handle";
+         script {
+            set_int(handler_zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom_show"))
+              {
+                 run_program(PROGRAM:"released_show");
+              }
+            else if (!strcmp(st, "zoom_top"))
+              {
+                 run_program(PROGRAM:"released_top");
+              }
+            else if (!strcmp(st, "zoom_bottom_reversed"))
+              {
+                 run_program(PROGRAM:"released_bottom_reversed");
+              }
+            else if (!strcmp(st, "zoom_top_reversed"))
+              {
+                 run_program(PROGRAM:"released_top_reversed");
+              }
+         }
+         after: "released2";
+      }
+      program { name: "released2";
+         in: 0.3 0.0;
+         script {
+            set_int(handler_zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom_show"))
+              {
+                 run_program(PROGRAM:"released_show");
+              }
+            else if (!strcmp(st, "zoom_top"))
+              {
+                 run_program(PROGRAM:"released_top");
+              }
+            else if (!strcmp(st, "zoom_bottom_reversed"))
+              {
+                 run_program(PROGRAM:"released_bottom_reversed");
+              }
+            else if (!strcmp(st, "zoom_top_reversed"))
+              {
+                 run_program(PROGRAM:"released_top_reversed");
+              }
+         }
+      }
+      program { name: "top";
+         signal: "elm,state,top";
          source: "elm";
          script {
-            new disabled;
+            new focused, disabled, zoomed;
+            focused = get_int(handler_focused);
             disabled = get_int(handler_disabled);
-            if (disabled == 0) {
-               set_state(PART:"handle", "bottom_reversed", 0.0);
+            set_int(handler_on_top, 1);
+            if ((focused == 1) && (disabled == 0)) {
+               zoomed = get_int(handler_zoomed);
+               if (zoomed) {
+                    set_state(PART:"handle", "zoom_top", 0.0);
+                 } else {
+                    set_state(PART:"handle", "top", 0.0);
+                 }
             } else {
                set_state(PART:"handle", "default", 0.0);
             }
          }
       }
-      program { name: "top_reversed";
-         signal: "elm,state,top,reversed";
+      program { name: "bottom";
+         signal: "elm,state,bottom";
          source: "elm";
          script {
-            new disabled;
+            new focused, disabled, zoomed;
+            focused = get_int(handler_focused);
             disabled = get_int(handler_disabled);
-            if (disabled == 0) {
-               set_state(PART:"handle", "top_reversed", 0.0);
+            zoomed = get_int(handler_zoomed);
+            set_int(handler_on_top, 0);
+            if ((focused == 1) && (disabled == 0)) {
+               if (zoomed) {
+                  set_state(PART:"handle", "zoom_show", 0.0);
+               } else {
+                  set_state(PART:"handle", "show", 0.0);
+               }
             } else {
                set_state(PART:"handle", "default", 0.0);
             }
          }
       }
-      program { name: "top";
-         signal: "elm,state,top";
+      program { name: "bottom_reversed";
+         signal: "elm,state,bottom,reversed";
          source: "elm";
          script {
-            new focused, disabled;
-            focused = get_int(handler_focused);
+            new disabled, zoomed;
             disabled = get_int(handler_disabled);
-            set_int(handler_ontop, 1);
-            if ((focused == 1) && (disabled == 0)) {
-               set_state(PART:"handle", "top", 0.0);
+            zoomed = get_int(handler_zoomed);
+            if (disabled == 0) {
+               if (zoomed) {
+                  set_state(PART:"handle", "zoom_bottom_reversed", 0.0);
+               } else {
+                  set_state(PART:"handle", "bottom_reversed", 0.0);
+               }
             } else {
                set_state(PART:"handle", "default", 0.0);
             }
          }
       }
-      program { name: "bottom";
-         signal: "elm,state,bottom";
+      program { name: "top_reversed";
+         signal: "elm,state,top,reversed";
          source: "elm";
          script {
-            new focused, disabled;
-            focused = get_int(handler_focused);
+            new disabled, zoomed;
             disabled = get_int(handler_disabled);
-            set_int(handler_ontop, 0);
-            if ((focused == 1) && (disabled == 0)) {
-               set_state(PART:"handle", "show", 0.0);
+            zoomed = get_int(handler_zoomed);
+            if (disabled == 0) {
+               if (zoomed) {
+                  set_state(PART:"handle", "zoom_top_reversed", 0.0);
+               } else {
+                  set_state(PART:"handle", "top_reversed", 0.0);
+               }
             } else {
                set_state(PART:"handle", "default", 0.0);
             }
@@ -2534,11 +2691,20 @@ group { name: "elm/entry/handler/start/default";
 }
 
 group { name: "elm/entry/handler/end/default";
+   alias: "elm/entry/selection/block_handle_right";
    data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
    data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WEIGHT_INC;
    images {
-      image: "copy&paste_handler_right_bottom.png" COMP;
-      image: "copy&paste_handler_right_top.png" COMP;
+      image: "copy&paste_handler_bottom_l.png" COMP;
+      image: "copy&paste_handler_bottom_r.png" COMP;
+      image: "copy&paste_handler_top_l.png" COMP;
+      image: "copy&paste_handler_top_r.png" COMP;
+   }
+   script {
+      public handler_on_top = 0;
+      public handler_focused = 0;
+      public handler_disabled = 0;
+      public handler_zoomed = 0;
    }
    parts {
       part { name: "handle";
@@ -2547,14 +2713,11 @@ group { name: "elm/entry/handler/end/default";
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            align: 0.5 0;
-            rel1.offset: 0 0;
+            align: 0 0;
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-            color: 0 184 230 255;
             image {
-               normal: "copy&paste_handler_right_bottom.png";
-               border: 0 0 0 0;
+               normal: "copy&paste_handler_bottom_r.png";
             }
          }
          description { state: "show" 0.0;
@@ -2564,31 +2727,49 @@ group { name: "elm/entry/handler/end/default";
          description { state: "top" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 0.5 1;
+            align: 0 1;
             image {
-               normal: "copy&paste_handler_right_top.png";
+               normal: "copy&paste_handler_top_r.png";
             }
          }
          description { state: "bottom_reversed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 0.5 0;
+            align: 1 0;
+            image {
+               normal: "copy&paste_handler_bottom_l.png";
+            }
          }
          description { state: "top_reversed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 0.5 1;
+            align: 1 1;
             image {
-               normal: "copy&paste_handler_right_top.png";
+               normal: "copy&paste_handler_top_l.png";
             }
          }
+         description { state: "zoom_show" 0.0;
+            inherit: "show" 0.0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
+         description { state: "zoom_top" 0.0;
+            inherit: "top" 0.0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
+         description { state: "zoom_bottom_reversed" 0.0;
+            inherit: "bottom_reversed" 0.0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
+         description { state: "zoom_top_reversed" 0.0;
+            inherit: "top_reversed" 0.0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
       }
    }
-   script {
-      public handler_ontop;
-      public handler_focused;
-      public handler_disabled;
-   }
    programs {
       program { name: "focused";
          signal: "edje,focus,in";
@@ -2605,18 +2786,141 @@ group { name: "elm/entry/handler/end/default";
             set_state(PART:"handle", "default", 0.0);
          }
       }
+      program { name: "pressed_show";
+         action: STATE_SET "zoom_show" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed_top";
+         action: STATE_SET "zoom_top" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed_bottom_reversed";
+         action: STATE_SET "zoom_bottom_reversed" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed_top_reversed";
+         action: STATE_SET "zoom_top_reversed" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_show";
+         action: STATE_SET "show" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_top";
+         action: STATE_SET "top" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_bottom_reversed";
+         action: STATE_SET "bottom_reversed" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_top_reversed";
+         action: STATE_SET "top_reversed" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed";
+         signal: "mouse,down,1";
+         source: "handle";
+         script {
+            set_int(handler_zoomed, 1);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "show"))
+              {
+                 run_program(PROGRAM:"pressed_show");
+              }
+            else if (!strcmp(st, "top"))
+              {
+                 run_program(PROGRAM:"pressed_top");
+              }
+            else if (!strcmp(st, "bottom_reversed"))
+              {
+                 run_program(PROGRAM:"pressed_bottom_reversed");
+              }
+            else if (!strcmp(st, "top_reversed"))
+              {
+                 run_program(PROGRAM:"pressed_top_reversed");
+              }
+         }
+      }
+      program { name: "released";
+         signal: "mouse,up,1";
+         source: "handle";
+         script {
+            set_int(handler_zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom_show"))
+              {
+                 run_program(PROGRAM:"released_show");
+              }
+            else if (!strcmp(st, "zoom_top"))
+              {
+                 run_program(PROGRAM:"released_top");
+              }
+            else if (!strcmp(st, "zoom_bottom_reversed"))
+              {
+                 run_program(PROGRAM:"released_bottom_reversed");
+              }
+            else if (!strcmp(st, "zoom_top_reversed"))
+              {
+                 run_program(PROGRAM:"released_top_reversed");
+              }
+         }
+         after: "released2";
+      }
+      program { name: "released2";
+         in: 0.3 0.0;
+         script {
+            set_int(handler_zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom_show"))
+              {
+                 run_program(PROGRAM:"released_show");
+              }
+            else if (!strcmp(st, "zoom_top"))
+              {
+                 run_program(PROGRAM:"released_top");
+              }
+            else if (!strcmp(st, "zoom_bottom_reversed"))
+              {
+                 run_program(PROGRAM:"released_bottom_reversed");
+              }
+            else if (!strcmp(st, "zoom_top_reversed"))
+              {
+                 run_program(PROGRAM:"released_top_reversed");
+              }
+         }
+      }
       program { name: "top";
          signal: "elm,state,top";
          source: "elm";
          script {
-            new focused, disabled;
+            new focused, disabled, zoomed;
             focused = get_int(handler_focused);
             disabled = get_int(handler_disabled);
-            set_int(handler_ontop, 1);
+            set_int(handler_on_top, 1);
             if ((focused == 1) && (disabled == 0)) {
-               set_state(PART:"handle", "top", 0.0);
+                 zoomed = get_int(handler_zoomed);
+                 if (zoomed) {
+                      set_state(PART:"handle", "zoom_top", 0.0);
+                 } else {
+                      set_state(PART:"handle", "top", 0.0);
+                 }
             } else {
-               set_state(PART:"handle", "default", 0.0);
+                 set_state(PART:"handle", "default", 0.0);
             }
          }
       }
@@ -2624,12 +2928,17 @@ group { name: "elm/entry/handler/end/default";
          signal: "elm,state,bottom";
          source: "elm";
          script {
-            new focused, disabled;
+            new focused, disabled, zoomed;
             focused = get_int(handler_focused);
             disabled = get_int(handler_disabled);
-            set_int(handler_ontop, 0);
+            zoomed = get_int(handler_zoomed);
+            set_int(handler_on_top, 0);
             if ((focused == 1) && (disabled == 0)) {
-               set_state(PART:"handle", "show", 0.0);
+               if (zoomed) {
+                  set_state(PART:"handle", "zoom_show", 0.0);
+               } else {
+                  set_state(PART:"handle", "show", 0.0);
+               }
             } else {
                set_state(PART:"handle", "default", 0.0);
             }
@@ -2639,10 +2948,15 @@ group { name: "elm/entry/handler/end/default";
          signal: "elm,state,bottom,reversed";
          source: "elm";
          script {
-            new disabled;
+            new disabled, zoomed;
             disabled = get_int(handler_disabled);
+            zoomed = get_int(handler_zoomed);
             if (disabled == 0) {
-               set_state(PART:"handle", "bottom_reversed", 0.0);
+               if (zoomed) {
+                  set_state(PART:"handle", "zoom_bottom_reversed", 0.0);
+               } else {
+                  set_state(PART:"handle", "bottom_reversed", 0.0);
+               }
             } else {
                set_state(PART:"handle", "default", 0.0);
             }
@@ -2652,10 +2966,15 @@ group { name: "elm/entry/handler/end/default";
          signal: "elm,state,top,reversed";
          source: "elm";
          script {
-            new disabled;
+            new disabled, zoomed;
             disabled = get_int(handler_disabled);
+            zoomed = get_int(handler_zoomed);
             if (disabled == 0) {
-               set_state(PART:"handle", "top_reversed", 0.0);
+               if (zoomed) {
+                  set_state(PART:"handle", "zoom_top_reversed", 0.0);
+               } else {
+                  set_state(PART:"handle", "top_reversed", 0.0);
+               }
             } else {
                set_state(PART:"handle", "default", 0.0);
             }
@@ -2692,32 +3011,10 @@ group { name: "elm/entry/handler/end/spinner/vertical";
 
 group { name: "elm/entry/cursor_handle/default";
    images {
-      set {
-         name: "copy&paste_handler_center_circle";
-         image {
-            image: SMALL"images/Copy_Paste/copy&paste_handler_center.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Copy_Paste/copy&paste_handler_center.png" COMP;
-         }
-      }
+      image: "copy&paste_handler_bottom_center.png" COMP;
+      image: "copy&paste_handler_top_center.png" COMP;
    }
    parts {
-      part { name: "sens";
-         type: RECT;
-         scale: 1;
-         mouse_events: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            color: 0 0 0 0;
-            rel1 { relative: -0.25 0.0; to: "handle";}
-            rel2 { relative: 1.25 1.0; to: "handle";}
-         }
-         description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
       part { name: "handle";
          scale: 1;
          mouse_events: 1;
@@ -2727,13 +3024,11 @@ group { name: "elm/entry/cursor_handle/default";
             align: 0 0;
             visible: 0;
             align: 0.5 0;
-            color: 0 184 230 255;
+            rel1.offset: -2 0;
             image {
-               normal: "copy&paste_handler_center_circle";
-               border: 0 0 0 0;
+               normal: "copy&paste_handler_bottom_center.png";
             }
             image.middle: SOLID;
-            fill.smooth: 0;
          }
          description { state: "show" 0.0;
             inherit: "default" 0.0;
@@ -2743,13 +3038,101 @@ group { name: "elm/entry/cursor_handle/default";
             inherit: "default" 0.0;
             visible: 1;
             align: 0.5 1.0;
+            image {
+               normal: "copy&paste_handler_top_center.png";
+            }
+         }
+         description { state: "zoom_show" 0.0;
+            inherit: "show" 0.0;
+            min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
+         }
+         description { state: "zoom_top" 0.0;
+            inherit: "top" 0.0;
+            min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
+            max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
       }
    }
    script {
-      public on_top;
+      public on_top = 0;
+      public zoomed = 0;
    }
    programs {
+      program { name: "pressed_show";
+         action: STATE_SET "zoom_show" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed_top";
+         action: STATE_SET "zoom_top" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_show";
+         action: STATE_SET "show" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "released_top";
+         action: STATE_SET "top" 0.0;
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { name: "pressed";
+         signal: "mouse,down,1";
+         source: "handle";
+         script {
+            set_int(zoomed, 1);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "show"))
+              {
+                 run_program(PROGRAM:"pressed_show");
+              }
+            else if (!strcmp(st, "top"))
+              {
+                 run_program(PROGRAM:"pressed_top");
+              }
+         }
+      }
+      program { name: "released";
+         signal: "mouse,up,1";
+         source: "handle";
+         script {
+            set_int(zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom_show"))
+              {
+                 run_program(PROGRAM:"released_show");
+              }
+            else if (!strcmp(st, "zoom_top"))
+              {
+                 run_program(PROGRAM:"released_top");
+              }
+         }
+         after: "released2";
+      }
+      program { name: "released2";
+         in: 0.3 0.0;
+         script {
+            set_int(zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom_show"))
+              {
+                 run_program(PROGRAM:"released_show");
+              }
+            else if (!strcmp(st, "zoom_top"))
+              {
+                 run_program(PROGRAM:"released_top");
+              }
+         }
+      }
       program { name: "focused";
          signal: "edje,focus,in";
          source: "edje";
@@ -2760,7 +3143,6 @@ group { name: "elm/entry/cursor_handle/default";
             } else {
                set_state(PART:"handle", "show", 0.0);
             }
-            set_state(PART:"sens", "show", 0.0);
          }
       }
       program { name: "unfocused";
@@ -2768,7 +3150,6 @@ group { name: "elm/entry/cursor_handle/default";
          source: "edje";
          script {
             set_state(PART:"handle", "default", 0.0);
-            set_state(PART:"sens", "default", 0.0);
          }
       }
       program { name: "show";
@@ -2776,8 +3157,12 @@ group { name: "elm/entry/cursor_handle/default";
          source: "edje";
          script {
             set_int(on_top, 0);
-            set_state(PART:"handle", "show", 0.0);
-            set_state(PART:"sens", "show", 0.0);
+            new zoomed_val = get_int(zoomed);
+            if (zoomed_val) {
+                 set_state(PART:"handle", "zoom_show", 0.0);
+            } else {
+                 set_state(PART:"handle", "show", 0.0);
+            }
          }
       }
       program { name: "hide";
@@ -2785,7 +3170,6 @@ group { name: "elm/entry/cursor_handle/default";
          source: "edje";
          script {
             set_state(PART:"handle", "default", 0.0);
-            set_state(PART:"sens", "default", 0.0);
          }
       }
       program { name: "top";
@@ -2793,14 +3177,18 @@ group { name: "elm/entry/cursor_handle/default";
          source: "edje";
          script {
             set_int(on_top, 1);
-            set_state(PART:"handle", "top", 0.0);
-            set_state(PART:"sens", "show", 0.0);
+            new zoomed_val = get_int(zoomed);
+            if (zoomed_val) {
+                 set_state(PART:"handle", "zoom_top", 0.0);
+            } else {
+                 set_state(PART:"handle", "top", 0.0);
+            }
          }
       }
    }
 }
 
-group { name: "elm/entry/selection/block_handle_edge_left";
+group { name: "elm/entry/handler/edge/start/default";
    parts {
       part { name: "align";
          type: SPACER;
@@ -2817,11 +3205,11 @@ group { name: "elm/entry/selection/block_handle_edge_left";
          mouse_events: 0;
          description { state: "default" 0.0;
             fixed: 1 0;
-            color: 0 81 181 255;
+            color: 0 184 230 255;
             min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
             max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
             rel2 { relative: 0 1; to_x: "align"; }
-            align: 0 0;
+            align: 0.5 0;
             visible: 0;
          }
          description { state: "show" 0.0;
@@ -2848,16 +3236,39 @@ group { name: "elm/entry/selection/block_handle_edge_left";
    }
 }
 
-group { name: "elm/entry/selection/block_handle_edge_right";
+group { name: "elm/entry/handler/edge/start/spinner/vertical";
+   alias: "elm/entry/handler/edge/start/spinner/datetime";
+   alias: "elm/entry/handler/edge/start/spinner/vertical_date_picker";
+   alias: "elm/entry/handler/edge/start/spinner/vertical_time_picker";
+}
+
+group { name: "elm/entry/handler/edge/end/spinner/vertical";
+   alias: "elm/entry/handler/edge/end/spinner/datetime";
+   alias: "elm/entry/handler/edge/end/spinner/vertical_date_picker";
+   alias: "elm/entry/handler/edge/end/spinner/vertical_time_picker";
+}
+
+group { name: "elm/entry/handler/edge/end/default";
    parts {
+      part { name: "align";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 0;
+            max: 0 0;
+            align: 0 0;
+         }
+      }
       part { name: "bg";
          type: RECT;
          scale: 1;
          mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 81 181 255;
+            color: 0 184 230 255;
             min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
             max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
+            rel2 { relative: 0 1; to_x: "align"; }
+            align: 0.5 0;
             visible: 0;
          }
          description { state: "show" 0.0;
@@ -3199,7 +3610,7 @@ group { name: "elm/scroller/entry/default";
                normal: "core_scroll_bar_v.#.png";
                middle: DEFAULT;
             }
-            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
+            color: 61 184 204 178;
          }
       }
       part { name: "sb_hbar_clip_master";
@@ -3268,7 +3679,7 @@ group { name: "elm/scroller/entry/default";
                normal: "core_scroll_bar_h.#.png";
                middle: DEFAULT;
             }
-            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
+            color: 61 184 204 178;
          }
       }
    }