[entry] Changed editfield colors, search bar colors.

        According to light theme GUI ver1.0.

Change-Id: I40318a52d5ef5113ad4fa74c5a7b1e409485cfd7

3 files changed, 28 insertions, 14 deletions

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index ad8a637d..1001b58e 100755
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -953,7 +953,7 @@
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#FAFAFA"
-#define ENTRY_DISABLED_TEXT_COLOR_INC "#FAFAFA66"
+#define ENTRY_DISABLED_TEXT_COLOR_INC "#FAFAFA99"
 #define ENTRY_GUIDE_TEXT_COLOR_INC "#5D6176"
 #define ENTRY_CURSOR_COLOR_INC 58 114 255 255
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#FAFAFA"
@@ -971,8 +971,15 @@
 #define MAGNIFIER_HEIGHT_FIXED 164
 #define MAGNIFIER_WIDTH_FIXED 325
 
+#define ENTRY_EDITFIELD_TEXT_SIZE_INC 44
+#define ENTRY_EDITFIELD_TEXT_COLOR_INC "#FAFAFA"
+#define ENTRY_EDITFIELD_DISABLED_TEXT_COLOR_INC "#FAFAFA99"
 #define ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC "#485D93"
+
 #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
+#define ENTRY_EDITFIELD_SEARCHBAR_TEXT_COLOR_INC "#FAFAFA"
+#define ENTRY_EDITFIELD_SEARCHBAR_DISABLED_TEXT_COLOR_INC "#5D617699"
+#define ENTRY_EDITFIELD_SEARCHBAR_GUIDE_TEXT_COLOR_INC "#5D6176"
 
 #define ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC "#000000"
 #define ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC "#00000080"
diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 49f33c80..0bab2d94 100755
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -623,7 +623,7 @@
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 60 60
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 54 54
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 0 0 0 255
 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 128
 
 #define BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC 60 60
@@ -972,8 +972,15 @@
 #define MAGNIFIER_HEIGHT_FIXED 164
 #define MAGNIFIER_WIDTH_FIXED 325
 
+#define ENTRY_EDITFIELD_TEXT_SIZE_INC 44
+#define ENTRY_EDITFIELD_TEXT_COLOR_INC "#000000"
+#define ENTRY_EDITFIELD_DISABLED_TEXT_COLOR_INC "#00000080"
 #define ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC "#90A9C7"
+
 #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36
+#define ENTRY_EDITFIELD_SEARCHBAR_TEXT_COLOR_INC "#000000"
+#define ENTRY_EDITFIELD_SEARCHBAR_DISABLED_TEXT_COLOR_INC "#87858080"
+#define ENTRY_EDITFIELD_SEARCHBAR_GUIDE_TEXT_COLOR_INC "#878580"
 
 #define ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC "#000000"
 #define ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC "#00000080"
diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 0fc6f4d1..9bb3a8f3 100644
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -657,7 +657,7 @@ group { name: "elm/entry/base/editfield";
    data.item: "max_font_size" "60";
    styles {
       style { name: "editfield_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -673,7 +673,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="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -689,7 +689,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_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -816,7 +816,7 @@ group { name: "elm/entry/base-charwrap/editfield";
    data.item: "max_font_size" "60";
    styles {
       style { name: "editfield_textblock_char_wrap_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -832,7 +832,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="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDTIFIELD_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -848,7 +848,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_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -974,7 +974,7 @@ group { name: "elm/entry/base-single/editfield";
    data.item: "max_font_size" "60";
    styles {
       style { name: "editfield_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=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -990,7 +990,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="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1006,7 +1006,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_EDITFIELD_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_EDITFIELD_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";
@@ -1127,7 +1127,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    }
    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";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_SEARCHBAR_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1143,7 +1143,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          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";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_SEARCHBAR_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1159,7 +1159,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          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";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_SEARCHBAR_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";