Resources updated

Change-Id: Id00f4661136c8a764cfa8fd83554b24d9ecce45e
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/include/define.h b/include/define.h
index 864044b..2568872 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -237,9 +237,6 @@
 
 #define IC_ADD_SCHEDULE_COLON_PNG "ic_add_schedule_colon.png"
 
-/* Transition */
-#define TRANSITION_FOCUS DECELERATE 0.20
-
 /* Scale and resolution */
 #define APP_BASE_SCALE      2.0
 #define BASE_RESOLUTION_X 1920.0

diff --git a/res/images/4.0/bar_settings_function_tint_green.9.png b/res/images/4.0/bar_settings_function_tint_green.9.png
new file mode 100644 (file)
index 0000000..27df4ef
Binary files /dev/null and b/res/images/4.0/bar_settings_function_tint_green.9.png differ

diff --git a/res/images/4.0/bar_settings_function_tint_red.9.png b/res/images/4.0/bar_settings_function_tint_red.9.png
new file mode 100644 (file)
index 0000000..bd096a7
Binary files /dev/null and b/res/images/4.0/bar_settings_function_tint_red.9.png differ

diff --git a/res/images/4.0/bar_settings_tint_green.#.png b/res/images/4.0/bar_settings_tint_green.#.png
new file mode 100644 (file)
index 0000000..9bc4469
Binary files /dev/null and b/res/images/4.0/bar_settings_tint_green.#.png differ

diff --git a/res/images/4.0/bar_settings_tint_green.9.png b/res/images/4.0/bar_settings_tint_green.9.png
new file mode 100644 (file)
index 0000000..9bc4469
Binary files /dev/null and b/res/images/4.0/bar_settings_tint_green.9.png differ

diff --git a/res/images/4.0/bar_settings_tint_red.#.png b/res/images/4.0/bar_settings_tint_red.#.png
new file mode 100644 (file)
index 0000000..1f9876d
Binary files /dev/null and b/res/images/4.0/bar_settings_tint_red.#.png differ

diff --git a/res/images/4.0/bar_settings_tint_red.9.png b/res/images/4.0/bar_settings_tint_red.9.png
new file mode 100644 (file)
index 0000000..1f9876d
Binary files /dev/null and b/res/images/4.0/bar_settings_tint_red.9.png differ

diff --git a/res/images/4.0/bg_dimmed_bk_95.9.png b/res/images/4.0/bg_dimmed_bk_95.9.png
new file mode 100644 (file)
index 0000000..c817f59
Binary files /dev/null and b/res/images/4.0/bg_dimmed_bk_95.9.png differ

diff --git a/res/images/4.0/bg_gradient_dimmed_60.9.png b/res/images/4.0/bg_gradient_dimmed_60.9.png
new file mode 100644 (file)
index 0000000..6622ea8
Binary files /dev/null and b/res/images/4.0/bg_gradient_dimmed_60.9.png differ

diff --git a/res/images/4.0/bg_gradient_dimmed_keypad.9.png b/res/images/4.0/bg_gradient_dimmed_keypad.9.png
new file mode 100644 (file)
index 0000000..bab2423
Binary files /dev/null and b/res/images/4.0/bg_gradient_dimmed_keypad.9.png differ

diff --git a/res/images/4.0/bg_settings_gray.#.png b/res/images/4.0/bg_settings_gray.#.png
new file mode 100644 (file)
index 0000000..20fc27b
Binary files /dev/null and b/res/images/4.0/bg_settings_gray.#.png differ

diff --git a/res/images/4.0/bg_settings_gray.9.png b/res/images/4.0/bg_settings_gray.9.png
new file mode 100644 (file)
index 0000000..20fc27b
Binary files /dev/null and b/res/images/4.0/bg_settings_gray.9.png differ

diff --git a/res/images/4.0/bg_settings_item_selected.9.png b/res/images/4.0/bg_settings_item_selected.9.png
new file mode 100644 (file)
index 0000000..f747480
Binary files /dev/null and b/res/images/4.0/bg_settings_item_selected.9.png differ

diff --git a/res/images/4.0/bg_settings_item_shadow.#.png b/res/images/4.0/bg_settings_item_shadow.#.png
new file mode 100644 (file)
index 0000000..2ccb1ba
Binary files /dev/null and b/res/images/4.0/bg_settings_item_shadow.#.png differ

diff --git a/res/images/4.0/img_tizen_settings_tint_red.#.png b/res/images/4.0/btn_checkbox_bg_26.png
similarity index 95%
rename from res/images/4.0/img_tizen_settings_tint_red.#.png
rename to res/images/4.0/btn_checkbox_bg_26.png
index 31e0b95..7b77435 100644 (file)
Binary files a/res/images/4.0/img_tizen_settings_tint_red.#.png and b/res/images/4.0/btn_checkbox_bg_26.png differ

diff --git a/res/images/4.0/img_tizen_dimmed_opacity75.9.png b/res/images/4.0/btn_checkbox_focused_26.png
similarity index 93%
rename from res/images/4.0/img_tizen_dimmed_opacity75.9.png
rename to res/images/4.0/btn_checkbox_focused_26.png
index d5f63c6..fc1c3ec 100644 (file)
Binary files a/res/images/4.0/img_tizen_dimmed_opacity75.9.png and b/res/images/4.0/btn_checkbox_focused_26.png differ

diff --git a/res/images/4.0/btn_tizen_settings_tab_normal_right.9.png b/res/images/4.0/btn_checkbox_icon_26.png
similarity index 89%
rename from res/images/4.0/btn_tizen_settings_tab_normal_right.9.png
rename to res/images/4.0/btn_checkbox_icon_26.png
index a9de55c..80c4e89 100644 (file)
Binary files a/res/images/4.0/btn_tizen_settings_tab_normal_right.9.png and b/res/images/4.0/btn_checkbox_icon_26.png differ

diff --git a/res/images/4.0/btn_settings_network_popup_button_focused.9.png b/res/images/4.0/btn_settings_network_popup_button_focused.9.png
deleted file mode 100644 (file)
index 88b12c2..0000000
Binary files a/res/images/4.0/btn_settings_network_popup_button_focused.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_settings_network_popup_tabbar_focused.9.png b/res/images/4.0/btn_settings_network_popup_tabbar_focused.9.png
deleted file mode 100644 (file)
index cfc8b9a..0000000
Binary files a/res/images/4.0/btn_settings_network_popup_tabbar_focused.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_list_bg.9.png b/res/images/4.0/btn_tizen_settings_list_bg.9.png
deleted file mode 100644 (file)
index b44438d..0000000
Binary files a/res/images/4.0/btn_tizen_settings_list_bg.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_list_bg_selected.9.png b/res/images/4.0/btn_tizen_settings_list_bg_selected.9.png
deleted file mode 100644 (file)
index fa3295b..0000000
Binary files a/res/images/4.0/btn_tizen_settings_list_bg_selected.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_list_focused.9.png b/res/images/4.0/btn_tizen_settings_list_focused.9.png
deleted file mode 100644 (file)
index a27fc4f..0000000
Binary files a/res/images/4.0/btn_tizen_settings_list_focused.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_popup_bg.9.png b/res/images/4.0/btn_tizen_settings_popup_bg.9.png
deleted file mode 100644 (file)
index b44438d..0000000
Binary files a/res/images/4.0/btn_tizen_settings_popup_bg.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_popup_radio_normal.png b/res/images/4.0/btn_tizen_settings_popup_radio_normal.png
deleted file mode 100644 (file)
index 1a3a756..0000000
Binary files a/res/images/4.0/btn_tizen_settings_popup_radio_normal.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_popup_radio_selected.png b/res/images/4.0/btn_tizen_settings_popup_radio_selected.png
deleted file mode 100644 (file)
index 2af57bf..0000000
Binary files a/res/images/4.0/btn_tizen_settings_popup_radio_selected.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_section_bg_focused.#.png b/res/images/4.0/btn_tizen_settings_section_bg_focused.#.png
deleted file mode 100644 (file)
index e07fa19..0000000
Binary files a/res/images/4.0/btn_tizen_settings_section_bg_focused.#.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_section_bg_focused.9.png b/res/images/4.0/btn_tizen_settings_section_bg_focused.9.png
deleted file mode 100644 (file)
index e07fa19..0000000
Binary files a/res/images/4.0/btn_tizen_settings_section_bg_focused.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_section_bg_normal.#.png b/res/images/4.0/btn_tizen_settings_section_bg_normal.#.png
deleted file mode 100644 (file)
index 30739e2..0000000
Binary files a/res/images/4.0/btn_tizen_settings_section_bg_normal.#.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_section_bg_normal.9.png b/res/images/4.0/btn_tizen_settings_section_bg_normal.9.png
deleted file mode 100644 (file)
index 30739e2..0000000
Binary files a/res/images/4.0/btn_tizen_settings_section_bg_normal.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_section_bg_selected.9.png b/res/images/4.0/btn_tizen_settings_section_bg_selected.9.png
deleted file mode 100644 (file)
index 7997a39..0000000
Binary files a/res/images/4.0/btn_tizen_settings_section_bg_selected.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_tab_normal_left.9.png b/res/images/4.0/btn_tizen_settings_tab_normal_left.9.png
deleted file mode 100644 (file)
index 9c3edd2..0000000
Binary files a/res/images/4.0/btn_tizen_settings_tab_normal_left.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_tab_selected.9.png b/res/images/4.0/btn_tizen_settings_tab_selected.9.png
deleted file mode 100644 (file)
index ff3e6c0..0000000
Binary files a/res/images/4.0/btn_tizen_settings_tab_selected.9.png and /dev/null differ

diff --git a/res/images/4.0/btn_tizen_settings_tabbar_focused_right.9.png b/res/images/4.0/btn_tizen_settings_tabbar_focused_right.9.png
deleted file mode 100644 (file)
index bb1be8e..0000000
Binary files a/res/images/4.0/btn_tizen_settings_tabbar_focused_right.9.png and /dev/null differ

diff --git a/res/images/4.0/ic_settings_list_check.png b/res/images/4.0/ic_settings_list_check.png
new file mode 100644 (file)
index 0000000..e546ca9
Binary files /dev/null and b/res/images/4.0/ic_settings_list_check.png differ

diff --git a/res/images/4.0/ic_settings_list_check_dis.png b/res/images/4.0/ic_settings_list_check_dis.png
new file mode 100644 (file)
index 0000000..f0b99ca
Binary files /dev/null and b/res/images/4.0/ic_settings_list_check_dis.png differ

diff --git a/res/images/4.0/ic_settings_list_check_sel.png b/res/images/4.0/ic_settings_list_check_sel.png
new file mode 100644 (file)
index 0000000..c5c3bd8
Binary files /dev/null and b/res/images/4.0/ic_settings_list_check_sel.png differ

diff --git a/res/images/4.0/ic_settings_list_wifi.png b/res/images/4.0/ic_settings_list_wifi.png
new file mode 100644 (file)
index 0000000..7cb9877
Binary files /dev/null and b/res/images/4.0/ic_settings_list_wifi.png differ

diff --git a/res/images/4.0/ic_settings_list_wifi_dis.png b/res/images/4.0/ic_settings_list_wifi_dis.png
new file mode 100644 (file)
index 0000000..cc94c0e
Binary files /dev/null and b/res/images/4.0/ic_settings_list_wifi_dis.png differ

diff --git a/res/images/4.0/ic_settings_list_wifi_sel.png b/res/images/4.0/ic_settings_list_wifi_sel.png
new file mode 100644 (file)
index 0000000..443ec11
Binary files /dev/null and b/res/images/4.0/ic_settings_list_wifi_sel.png differ

diff --git a/res/images/4.0/ic_tizen_settings_list_check.png b/res/images/4.0/ic_tizen_settings_list_check.png
deleted file mode 100644 (file)
index b2a9055..0000000
Binary files a/res/images/4.0/ic_tizen_settings_list_check.png and /dev/null differ

diff --git a/res/images/4.0/ic_tizen_settings_list_check_selected.png b/res/images/4.0/ic_tizen_settings_list_check_selected.png
deleted file mode 100644 (file)
index 6698f28..0000000
Binary files a/res/images/4.0/ic_tizen_settings_list_check_selected.png and /dev/null differ

diff --git a/res/images/4.0/ic_tizen_settings_wifi.png b/res/images/4.0/ic_tizen_settings_wifi.png
deleted file mode 100644 (file)
index 98ef6ee..0000000
Binary files a/res/images/4.0/ic_tizen_settings_wifi.png and /dev/null differ

diff --git a/res/images/4.0/ic_tizen_settings_wifi_selected.png b/res/images/4.0/ic_tizen_settings_wifi_selected.png
deleted file mode 100644 (file)
index 8840f71..0000000
Binary files a/res/images/4.0/ic_tizen_settings_wifi_selected.png and /dev/null differ

diff --git a/res/images/4.0/img_settings_network_Failed.png b/res/images/4.0/img_settings_network_Failed.png
new file mode 100644 (file)
index 0000000..9ac6956
Binary files /dev/null and b/res/images/4.0/img_settings_network_Failed.png differ

diff --git a/res/images/4.0/img_settings_network_completed.png b/res/images/4.0/img_settings_network_completed.png
new file mode 100644 (file)
index 0000000..0f621af
Binary files /dev/null and b/res/images/4.0/img_settings_network_completed.png differ

diff --git a/res/images/4.0/img_settings_network_dot.png b/res/images/4.0/img_settings_network_dot.png
new file mode 100644 (file)
index 0000000..9c64579
Binary files /dev/null and b/res/images/4.0/img_settings_network_dot.png differ

diff --git a/res/images/4.0/img_settings_network_tv.png b/res/images/4.0/img_settings_network_tv.png
new file mode 100644 (file)
index 0000000..ca6b12b
Binary files /dev/null and b/res/images/4.0/img_settings_network_tv.png differ

diff --git a/res/images/4.0/img_settings_network_web.png b/res/images/4.0/img_settings_network_web.png
new file mode 100644 (file)
index 0000000..625b50e
Binary files /dev/null and b/res/images/4.0/img_settings_network_web.png differ

diff --git a/res/images/4.0/img_settings_scroll_area.9.png b/res/images/4.0/img_settings_scroll_area.9.png
new file mode 100644 (file)
index 0000000..3af97fe
Binary files /dev/null and b/res/images/4.0/img_settings_scroll_area.9.png differ

diff --git a/res/images/4.0/img_settings_scroll_bar.9.png b/res/images/4.0/img_settings_scroll_bar.9.png
new file mode 100644 (file)
index 0000000..0ac5d94
Binary files /dev/null and b/res/images/4.0/img_settings_scroll_bar.9.png differ

diff --git a/res/images/4.0/img_tizen_settings_function_handler.png b/res/images/4.0/img_settings_slider_handler_h.png
similarity index 55%
rename from res/images/4.0/img_tizen_settings_function_handler.png
rename to res/images/4.0/img_settings_slider_handler_h.png
index d032f7e..e28b72d 100644 (file)
Binary files a/res/images/4.0/img_tizen_settings_function_handler.png and b/res/images/4.0/img_settings_slider_handler_h.png differ

diff --git a/res/images/4.0/img_tizen_dimmed_opacity85.9.png b/res/images/4.0/img_tizen_dimmed_opacity85.9.png
deleted file mode 100644 (file)
index 42ed9d2..0000000
Binary files a/res/images/4.0/img_tizen_dimmed_opacity85.9.png and /dev/null differ

diff --git a/res/images/4.0/img_tizen_settings_function_blue.9.png b/res/images/4.0/img_tizen_settings_function_blue.9.png
deleted file mode 100644 (file)
index b8b596c..0000000
Binary files a/res/images/4.0/img_tizen_settings_function_blue.9.png and /dev/null differ

diff --git a/res/images/4.0/img_tizen_settings_function_gray.9.png b/res/images/4.0/img_tizen_settings_function_gray.9.png
deleted file mode 100644 (file)
index 01ab8d1..0000000
Binary files a/res/images/4.0/img_tizen_settings_function_gray.9.png and /dev/null differ

diff --git a/res/images/4.0/img_tizen_settings_function_tint_green.9.png b/res/images/4.0/img_tizen_settings_function_tint_green.9.png
deleted file mode 100644 (file)
index f063e60..0000000
Binary files a/res/images/4.0/img_tizen_settings_function_tint_green.9.png and /dev/null differ

diff --git a/res/images/4.0/img_tizen_settings_function_tint_handler.png b/res/images/4.0/img_tizen_settings_function_tint_handler.png
deleted file mode 100644 (file)
index 2f7e901..0000000
Binary files a/res/images/4.0/img_tizen_settings_function_tint_handler.png and /dev/null differ

diff --git a/res/images/4.0/img_tizen_settings_function_tint_red.9.png b/res/images/4.0/img_tizen_settings_function_tint_red.9.png
deleted file mode 100644 (file)
index 696c2fe..0000000
Binary files a/res/images/4.0/img_tizen_settings_function_tint_red.9.png and /dev/null differ

diff --git a/res/images/4.0/img_tizen_settings_tint_green.#.png b/res/images/4.0/img_tizen_settings_tint_green.#.png
deleted file mode 100644 (file)
index e883675..0000000
Binary files a/res/images/4.0/img_tizen_settings_tint_green.#.png and /dev/null differ

diff --git a/res/images/4.0/settings_network_popup_button_focused.9.png b/res/images/4.0/settings_network_popup_button_focused.9.png
deleted file mode 100644 (file)
index 0ad9447..0000000
Binary files a/res/images/4.0/settings_network_popup_button_focused.9.png and /dev/null differ

diff --git a/res/images/4.0/settings_network_popup_button_selected.9.png b/res/images/4.0/settings_network_popup_button_selected.9.png
deleted file mode 100644 (file)
index f375817..0000000
Binary files a/res/images/4.0/settings_network_popup_button_selected.9.png and /dev/null differ

diff --git a/res/widget/button.edc b/res/widget/button.edc
index 6beefd7..832d3f8 100644 (file)
--- a/res/widget/button.edc
+++ b/res/widget/button.edc
@@ -20,8 +20,10 @@
 #define IC_ARROW_LEFT "ic_arrow_left.png"
 #define IC_ARROW_RIGHT "ic_arrow_right.png"
 
-#define BG_NORMAL "4.0/btn_tizen_settings_section_bg_normal.#.png"
-#define BG_FOCUS  "4.0/btn_tizen_settings_section_bg_focused.#.png"
+#define BG_NORMAL "4.0/bg_settings_gray.#.png"
+#define SHADOW_IMG  "4.0/bg_settings_item_shadow.#.png"
+
+#define TRANSITION_FOCUS LINEAR 0.333
 
 group {
        name, "elm/button/base/style.menu.button";
@@ -560,7 +562,7 @@ group {
        data.item, "focus_highlight" "on";
        images {
                image: BG_NORMAL COMP;
-               image: BG_FOCUS COMP;
+               image: SHADOW_IMG COMP;
        }
        parts {
                part {
@@ -587,17 +589,10 @@ group {
                                image.normal: BG_NORMAL;
                        }
                        description {
-                               state: "image_change" 0.0;
-                               inherit: "default" 0.0;
-                               rel1.relative: -0.1355 -0.1973;
-                               rel2.relative:  1.1355  1.1973;
-                               image.normal: BG_FOCUS;
-                       }
-                       description {
                                state, "focused" 0.0;
-                               inherit, "image_change" 0.0;
-                               rel1.relative: -0.1623 -0.2201;
-                               rel2.relative:  1.1623  1.2201;
+                               inherit, "default" 0.0;
+                               rel1.relative: -0.05 -0.05;
+                               rel2.relative:  1.05  1.05;
                                color: 255 255 255 255;
                        }
                }
@@ -653,12 +648,6 @@ group {
                        name, "focused";
                        signal, SIG_FOCUSED;
                        source, "elm";
-                       action, STATE_SET "image_change" 0.0;
-                       target, "bg";
-                       after: "focused_scale";
-               }
-               program {
-                       name, "focused_scale";
                        action, STATE_SET "focused" 0.0;
                        target, "bg";
                        target, "elm.text";

diff --git a/res/widget/progressbar.edc b/res/widget/progressbar.edc
index ba33729..7efc910 100644 (file)
--- a/res/widget/progressbar.edc
+++ b/res/widget/progressbar.edc
@@ -97,8 +97,8 @@ group {
        }
 }
 
-#define IMG_TINT_GREEN_PNG "images/4.0/img_tizen_settings_tint_green.#.png"
-#define IMG_TINT_RED_PNG "images/4.0/img_tizen_settings_tint_red.#.png"
+#define IMG_TINT_GREEN_PNG "images/4.0/bar_settings_tint_green.#.png"
+#define IMG_TINT_RED_PNG "images/4.0/bar_settings_tint_red.#.png"
 
 group {
        images {

diff --git a/res/widget/radio.edc b/res/widget/radio.edc
index b723829..3628085 100644 (file)
--- a/res/widget/radio.edc
+++ b/res/widget/radio.edc
@@ -341,12 +341,12 @@ group { name: "elm/radio/base/style.network";
        }
 }
 
-#define ON_NORMAL "4.0/ic_tizen_settings_list_check.png"
-#define ON_FOCUSED "4.0/ic_tizen_settings_list_check_selected.png"
-#define ON_DISABLED "4.0/ic_tizen_settings_list_check.png"
-#define OFF_NORMAL "4.0/ic_tizen_settings_list_check.png"
-#define OFF_FOCUSED "4.0/ic_tizen_settings_list_check_selected.png"
-#define OFF_DISABLED "4.0/ic_tizen_settings_list_check.png"
+#define ON_NORMAL "4.0/ic_settings_list_check.png"
+#define ON_FOCUSED "4.0/ic_settings_list_check_sel.png"
+#define ON_DISABLED "4.0/ic_settings_list_check_dis.png"
+#define OFF_NORMAL "4.0/ic_settings_list_check.png"
+#define OFF_FOCUSED "4.0/ic_settings_list_check_sel.png"
+#define OFF_DISABLED "4.0/ic_settings_list_check_dis.png"
 
 group { name: "elm/radio/base/style.popup.list";
        inherit: "elm/radio/base/style.network";