privacy: remove "security" from menu

The "secure erase" is not supported according to 6.0 guideline,
Chagne the title from "Privacy and security" to "Privacy"

Change-Id: Ie90b9dc8701f39e2cbc08af4b6a5f504779baa6a

diff --git a/setting-common/include/setting-common-string.h b/setting-common/include/setting-common-string.h
index fa77b1191a89c473b82dd662393c5462e5c81721..eda2780b954f7df7afedd4482117ab26d3e1e4f1 100755 (executable)
--- a/setting-common/include/setting-common-string.h
+++ b/setting-common/include/setting-common-string.h
@@ -96,7 +96,7 @@
 #define KeyStr_SoftKey                 "IDS_ST_BODY_SOFTKEY"
 
 #define KeyStr_Accounts                        "IDS_ST_BODY_ACCOUNTS"
-#define KeyStr_Privacy                 "IDS_ST_HEADER_PRIVACY_AND_SECURITY_ABB"
+#define KeyStr_Privacy                 "IDS_ST_HEADER_PRIVACY"
 #define KeyStr_Storage                 "IDS_ST_BODY_STORAGE"
 #define KeyStr_Save                    "IDS_ST_BODY_SAVE"
 

diff --git a/setting-privacy/src/setting-privacy-main.c b/setting-privacy/src/setting-privacy-main.c
index a35cba250fb14a0320c9a6cfd0682db70addee27..aeeb6ff91b44ba2bac2ddac8ca2843f5a1ec20d3 100755 (executable)
--- a/setting-privacy/src/setting-privacy-main.c
+++ b/setting-privacy/src/setting-privacy-main.c
@@ -64,8 +64,6 @@ static void _mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
 
        if (!safeStrCmp(KeyStr_PrivacySettings, list_item->keyStr))
                app_launcher("org.tizen.privacy-setting", NULL, NULL);
-       else if (!safeStrCmp(KeyStr_SecureErase, list_item->keyStr))
-               app_launcher("org.tizen.secure-erase", NULL, NULL);
 }
 
 /**************************************************
@@ -89,20 +87,6 @@ int _generate_genlist(SettingPrivacy *ad)
                        NULL, NULL, 0,
                        KeyStr_PrivacySettings, NULL, NULL);
 
-       /* Security */
-       setting_create_Gendial_field_titleItem(ad->md.genlist,
-                       &itc_group_item, KeyStr_Security, NULL);
-       ad->secure_erase = setting_create_Gendial_field_def(scroller,
-                       &(ad->itc_2text_2),
-                       _mouse_up_Gendial_list_cb,
-                       ad, SWALLOW_Type_INVALID,
-                       NULL, NULL, 0,
-                       KeyStr_SecureErase, KeyStr_SecureErase_Desc, NULL);
-       if (ad->secure_erase)
-               ad->secure_erase->userdata = ad;
-       else
-               SETTING_TRACE_ERROR("ad->secure_erase is NULL");
-
        SETTING_TRACE_END;
        return SETTING_RETURN_SUCCESS;
 }
@@ -119,7 +103,7 @@ static int _view_create(void *cb)
        SettingPrivacy *ad = (SettingPrivacy *)cb;
        retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       ret = view_init(&ad->md, _("IDS_ST_HEADER_PRIVACY_AND_SECURITY_ABB"));
+       ret = view_init(&ad->md, _("IDS_ST_HEADER_PRIVACY"));
        if (ret != SETTING_RETURN_SUCCESS)
                return ret;