Merge "Fix build break & Temporary disable flip icon"

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 25e9f74..3fd6a05 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -655,7 +655,7 @@
 #define BUTTON_CONTACT_PADDING_MIN_INC 20 1
 #define BUTTON_CONTACT_FONT_SIZE_INC 36
 
-#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 106 74
+#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 144 114
 #define BUTTON_NAVIFRAME_BACK_BUTTON_BG_BORDER_INC 5 5 5 5
 #define BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC 56 56
 

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 37b0c3e..07ce9d3 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -8220,9 +8220,7 @@ group { name: "elm/button/base/searchbar/default";
       alias: "elm/button/base/naviframe/prev_btn/default";
       alias: "elm/button/base/naviframe/end_btn/default";
       images {
-         image: "00_winset_Back_btn_normal.png" COMP;
-         image: "00_winset_Back_btn_press.png" COMP;
-         image: "00_winset_Back_btn_normal_focus.png" COMP;
+         image: "00_winset_toolbar_press.png" COMP;
          image: "00_winset_Back.png" COMP;
       }
       script {
@@ -8234,22 +8232,27 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               color: 0 0 0 0;
+            }
+            description { state: "clicked" 0.0;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
                image {
-                  normal: "00_winset_Back_btn_normal.png";
+                  normal: "00_winset_toolbar_press.png";
                   border: BUTTON_NAVIFRAME_BACK_BUTTON_BG_BORDER_INC;
-                  border_scale: 1;
                }
             }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_winset_Back_btn_press.png";
-            }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               color: 127 127 127 127;
             }
             description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_winset_Back_btn_normal_focus.png";
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               image {
+                  normal: "00_winset_toolbar_press.png";
+                  border: BUTTON_NAVIFRAME_BACK_BUTTON_BG_BORDER_INC;
+               }
             }
          }
          part { name: "back_button";