Applied NFC enable for emulator

 - Target is NOT applied. (There is no NFC menu on the target)

Change-Id: I09c9ce8253b8a698f68bc13d113d91ff2d847124
Signed-off-by: JinWang An <jinwang.an@samsung.com>

diff --git a/org.tizen.setting.xml.in b/org.tizen.setting.xml.in
index 06769d80cdfab68736154f7bef9d87c23669f8a0..c5bb37ea5438a4a7727650604f244e1b803c39b6 100755 (executable)
--- a/org.tizen.setting.xml.in
+++ b/org.tizen.setting.xml.in
@@ -272,5 +272,6 @@
                <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
                <privilege>http://tizen.org/privilege/telephony</privilege>
                <privilege>http://tizen.org/privilege/display</privilege>
+               <privilege>http://tizen.org/privilege/nfc.admin</privilege>
        </privileges>
 </manifest>

diff --git a/setting-common/src/setting-cfg.c b/setting-common/src/setting-cfg.c
index 5d17f8d85b51f6b71ad5f2755f853ac470d36812..2cca3c764a95350676f1e2eaee6e02c6513c566f 100644 (file)
--- a/setting-common/src/setting-cfg.c
+++ b/setting-common/src/setting-cfg.c
@@ -185,11 +185,12 @@ static Setting_Cfg_Node_T s_cfg_node_array[] = {
        {KeyStr_FlightMode, IMG_FlightMode, "setting-flightmode-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable,  0, Cfg_Item_Ui_Node_Toggle, NULL, KeyStr_Connections, &flightmode_tfunc, uuid_FlightMode, 0, NULL},
 #endif
 
+#ifdef TIZEN_BUILD_EMULATOR
+       {KeyStr_NFC, IMG_NFC, "ug-nfc-efl|type:nfc", Cfg_Item_Pos_Level0, Cfg_Item_unResetable,  0, Cfg_Item_Ug_Node_Toggle, NULL, KeyStr_Connections, &nfc_tfunc, uuid_NFC, 0, "ug-nfc-efl"},
+#endif
+
 #ifdef TIZEN_BUILD_TARGET
        {KeyStr_MobileAP, IMG_MobileAP, "ug-setting-mobileap-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable,  0, Cfg_Item_AppLauncher_Node, NULL, KeyStr_Connections, NULL, uuid_MobileAP, 0, NULL},
-#ifdef _M0
-       {KeyStr_NFC, IMG_NFC, "setting-nfc-efl|type:nfc", Cfg_Item_Pos_Level0, Cfg_Item_unResetable,  0, Cfg_Item_Ug_Node_Toggle, NULL, KeyStr_Connections, &nfc_tfunc, uuid_NFC, 0, "setting-nfc-efl"},
-#endif
 #endif
 #ifdef TIZEN_BUILD_TARGET
        {KeyStr_MobileNetworks, IMG_Network, "setting-network-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0,  Cfg_Item_Ug_Node, NULL, KeyStr_Connections, NULL, uuid_Network, 0, NULL},

diff --git a/setting-common/src/setting-common-search.c b/setting-common/src/setting-common-search.c
index c9f3ee841415ebd6b371050eb6932434ffb6a8ff..6cd2299557b406a44f0bf7cffacba221666bfcca 100755 (executable)
--- a/setting-common/src/setting-common-search.c
+++ b/setting-common/src/setting-common-search.c
@@ -590,8 +590,8 @@ int __setting_init_search_index_module()
                "setting-synchronise-efl",                              /* NO CODE !!! */
                "wifi-efl-UG",                                                  /* NO CODE !!! */
                "setting-wifidirect-efl",                               /* NO CODE !!! */
-               "worldclock-efl"                                                /* NO CODE !!! */
-               "setting-nfc-efl",                                              /* NO CODE !!! */
+               "worldclock-efl",                                               /* NO CODE !!! */
+               "ug-nfc-efl",                                                   /* NO CODE !!! */
                "setting-font-efl",                                             /* NO CODE !!! */
                "quickpanel-setting-efl",                               /* NO CODE !!! */
                "setting-easymode-efl",                                 /* NO CODE !!! */