Changed icons used by the wifi scan list to match the UI guide

Signed-off-by: Abhishek Sansanwal <abhishek.s94@samsung.com>
Change-Id: I55d4685435bf51f812fa3a10785b8e9f95728c20

diff --git a/include/layout/network.h b/include/layout/network.h
index 2c144f1..7613e93 100644 (file)
--- a/include/layout/network.h
+++ b/include/layout/network.h
@@ -87,24 +87,28 @@
 #define COUNT_NETWORK_TYPE 3
 
 /* Image */
-#define IC_NETWORK_NOR_01_PNG "ic_network_nor_01.png"
-#define IC_NETWORK_NOR_02_PNG "ic_network_nor_02.png"
-#define IC_NETWORK_NOR_03_PNG "ic_network_nor_03.png"
-#define IC_NETWORK_NOR_04_PNG "ic_network_nor_04.png"
-#define IC_NETWORK_FOC_01_PNG "ic_network_foc_01.png"
-#define IC_NETWORK_FOC_02_PNG "ic_network_foc_02.png"
-#define IC_NETWORK_FOC_03_PNG "ic_network_foc_03.png"
-#define IC_NETWORK_FOC_04_PNG "ic_network_foc_04.png"
-#define IC_LOCK_NETWORK_NOR_01_PNG "ic_lock_network_nor_01.png"
-#define IC_LOCK_NETWORK_NOR_02_PNG "ic_lock_network_nor_02.png"
-#define IC_LOCK_NETWORK_NOR_03_PNG "ic_lock_network_nor_03.png"
-#define IC_LOCK_NETWORK_NOR_04_PNG "ic_lock_network_nor_04.png"
-#define IC_LOCK_NETWORK_FOC_01_PNG "ic_lock_network_foc_01.png"
-#define IC_LOCK_NETWORK_FOC_02_PNG "ic_lock_network_foc_02.png"
-#define IC_LOCK_NETWORK_FOC_03_PNG "ic_lock_network_foc_03.png"
-#define IC_LOCK_NETWORK_FOC_04_PNG "ic_lock_network_foc_04.png"
-#define IC_CHECK_NOR_PNG "ic_thumb_check_sel.png"
-#define IC_CHECK_FOC_PNG "ic_thumb_check_foc.png"
+#define IC_NETWORK_NOR_00_PNG "4.0/ic_settings_wifi00.png"
+#define IC_NETWORK_NOR_01_PNG "4.0/ic_settings_wifi01.png"
+#define IC_NETWORK_NOR_02_PNG "4.0/ic_settings_wifi02.png"
+#define IC_NETWORK_NOR_03_PNG "4.0/ic_settings_wifi03.png"
+#define IC_NETWORK_NOR_04_PNG "4.0/ic_settings_wifi04.png"
+#define IC_NETWORK_FOC_00_PNG "4.0/ic_settings_wifi00.png"
+#define IC_NETWORK_FOC_01_PNG "4.0/ic_settings_wifi01.png"
+#define IC_NETWORK_FOC_02_PNG "4.0/ic_settings_wifi02.png"
+#define IC_NETWORK_FOC_03_PNG "4.0/ic_settings_wifi03.png"
+#define IC_NETWORK_FOC_04_PNG "4.0/ic_settings_wifi04.png"
+#define IC_LOCK_NETWORK_NOR_00_PNG "4.0/ic_settings_wifi00_lock.png"
+#define IC_LOCK_NETWORK_NOR_01_PNG "4.0/ic_settings_wifi01_lock.png"
+#define IC_LOCK_NETWORK_NOR_02_PNG "4.0/ic_settings_wifi02_lock.png"
+#define IC_LOCK_NETWORK_NOR_03_PNG "4.0/ic_settings_wifi03_lock.png"
+#define IC_LOCK_NETWORK_NOR_04_PNG "4.0/ic_settings_wifi04_lock.png"
+#define IC_LOCK_NETWORK_FOC_00_PNG "4.0/ic_settings_wifi00_lock.png"
+#define IC_LOCK_NETWORK_FOC_01_PNG "4.0/ic_settings_wifi01_lock.png"
+#define IC_LOCK_NETWORK_FOC_02_PNG "4.0/ic_settings_wifi02_lock.png"
+#define IC_LOCK_NETWORK_FOC_03_PNG "4.0/ic_settings_wifi03_lock.png"
+#define IC_LOCK_NETWORK_FOC_04_PNG "4.0/ic_settings_wifi04_lock.png"
+#define IC_CHECK_NOR_PNG "4.0/ic_settings_list_check.png"
+#define IC_CHECK_FOC_PNG "4.0/ic_settings_list_check.png"
 #define IC_CHECK_FAIL_NOR_PNG "ic_thumb_failed_sel.png"
 #define IC_CHECK_FAIL_FOC_PNG "ic_thumb_failed_foc.png"
 #define IC_NETWORK_LOADING_01_PNG "network_loading_01.png"

diff --git a/res/widget/gengrid_network.edc b/res/widget/gengrid_network.edc
index ade81d8..9a79837 100644 (file)
--- a/res/widget/gengrid_network.edc
+++ b/res/widget/gengrid_network.edc
@@ -33,18 +33,22 @@ group {
        data.item, "texts" "part.wifi.name";
        data.item, "states" "part_state_check part_state_lock";
        images {
+               image, IC_NETWORK_NOR_00_PNG COMP;
                image, IC_NETWORK_NOR_01_PNG COMP;
                image, IC_NETWORK_NOR_02_PNG COMP;
                image, IC_NETWORK_NOR_03_PNG COMP;
                image, IC_NETWORK_NOR_04_PNG COMP;
+               image, IC_NETWORK_FOC_00_PNG COMP;
                image, IC_NETWORK_FOC_01_PNG COMP;
                image, IC_NETWORK_FOC_02_PNG COMP;
                image, IC_NETWORK_FOC_03_PNG COMP;
                image, IC_NETWORK_FOC_04_PNG COMP;
+               image, IC_LOCK_NETWORK_NOR_00_PNG COMP;
                image, IC_LOCK_NETWORK_NOR_01_PNG COMP;
                image, IC_LOCK_NETWORK_NOR_02_PNG COMP;
                image, IC_LOCK_NETWORK_NOR_03_PNG COMP;
                image, IC_LOCK_NETWORK_NOR_04_PNG COMP;
+               image, IC_LOCK_NETWORK_FOC_00_PNG COMP;
                image, IC_LOCK_NETWORK_FOC_01_PNG COMP;
                image, IC_LOCK_NETWORK_FOC_02_PNG COMP;
                image, IC_LOCK_NETWORK_FOC_03_PNG COMP;
@@ -151,6 +155,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
+                               color, 0 0 0 0;
                                rel1 {
                                        to: "map";
                                }
@@ -163,7 +168,7 @@ group {
                        description {
                                state, "focused" 0.0;
                                inherit, "default" 0.0;
-                               color, 0 119 246 255;
+                               color, 255 255 255 255;
                        }
                }
 
@@ -237,8 +242,8 @@ group {
                        description {
                                state, "removed.focused.locked" 0.0;
                                visible, 0;
-                               inherit, "focused.locked" 0.0;
-                               image.normal, IC_LOCK_NETWORK_FOC_01_PNG;
+                       //      inherit, "focused.locked" 0.0;
+                       //      image.normal, IC_LOCK_NETWORK_FOC_00_PNG;
                        }
                        description {
                                state, "focused.locked" 0.1;
@@ -265,7 +270,7 @@ group {
                                state, "removed.focused.unlocked" 0.0;
                                visible, 0;
                                inherit, "focused.unlocked" 0.0;
-                               image.normal, IC_NETWORK_FOC_01_PNG;
+                               image.normal, IC_NETWORK_FOC_00_PNG;
                        }
                        description {
                                state, "focused.unlocked" 0.1;
@@ -294,7 +299,7 @@ group {
                                state, "removed.unfocused.locked" 0.0;
                                visible, 0;
                                inherit, "unfocused.locked" 0.0;
-                               image.normal, IC_LOCK_NETWORK_NOR_01_PNG;
+                               image.normal, IC_LOCK_NETWORK_NOR_00_PNG;
                        }
                        description {
                                state, "unfocused.locked" 0.1;
@@ -321,7 +326,7 @@ group {
                                state, "removed.unfocused.unlocked" 0.0;
                                visible, 0;
                                inherit, "unfocused.unlocked" 0.0;
-                               image.normal, IC_NETWORK_NOR_01_PNG;
+                               image.normal, IC_NETWORK_NOR_00_PNG;
                        }
                        description {
                                state, "unfocused.unlocked" 0.1;
@@ -407,7 +412,7 @@ group {
                        description {
                                state, "focused" 0.0;
                                inherit, "default" 0.0;
-                               color, 255 255 255 255;
+                               color, 51 51 51 255;
                                map.on, 1;
                        }
                        description {
@@ -574,6 +579,7 @@ group {
                                }
                                align, 0.5 0.0;
                                fixed, 0 1;
+                               visible, 0;
                        }
                }
 
@@ -595,6 +601,7 @@ group {
                                }
                                align, 0.0 0.5;
                                fixed, 1 0;
+                               visible, 0;
                        }
                }
 
@@ -634,6 +641,7 @@ group {
                                rel2.to, "part.bg";
                                align, 1.0 0.5;
                                fixed, 1 0;
+                               visible, 0;
                        }
                }
        }