Merge "Add wired network & new network view - Support 'wired' network type - Add...

diff --cc CMakeLists.txt
Simple merge

diff --cc include/define.h
Simple merge

diff --cc include/layout/network.h
index f4ed348,889051d..9227a02
--- 1/include/layout/network.h
--- 2/include/layout/network.h
+++ b/include/layout/network.h
@@@ -56,8 -66,12 +66,8 @@@
  #define STR_CANCEL "Cancel"
  
  /* Count */
- #define COUNT_NETWORK_TYPE 2
+ #define COUNT_NETWORK_TYPE 3
  
 -/* Size */
 -#define SIZE_NETWORK_CTXPOPUP_W 310
 -#define SIZE_NETWORK_CTXPOPUP_H 114
 -
  /* Image */
  #define IC_NETWORK_NOR_01_PNG "ic_network_nor_01.png"
  #define IC_NETWORK_NOR_02_PNG "ic_network_nor_02.png"

diff --cc res/settings-theme.edc
Simple merge

diff --cc src/common/utils.c
Simple merge

diff --cc src/layout/layout_network.c
Simple merge