From: Kiseok Chang <kiso.chang@samsung.com>
Date: Tue, 12 Jan 2021 04:10:23 +0000 (+0900)
Subject: Remove 'Screen lock sound'
X-Git-Tag: submit/tizen/20210112.042431^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70937b2ff23ee3071d8f6c88339935176de6f9b1;p=profile%2Fcommon%2Fapps%2Fnative%2Fsettings.git

Remove 'Screen lock sound'

- from Sound > Other sounds

Change-Id: I499914a5d84083846d46afc42bf47dc7ff4888f1
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>
---

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index d9c2d7f..09b8c77 100755
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -77,7 +77,7 @@ static Eina_Bool _view_pop_cb(void *data, Elm_Object_Item *it)
 {
 	SETTING_TRACE_BEGIN;
 
-	retm_if(data == NULL, "Data parameter is NULL");
+	retvm_if(data == NULL, EINA_TRUE, "Data parameter is NULL");
 	SettingFontData *ad = (SettingFontData *)data;
 
 	if (ad->size_change_flag) {
diff --git a/setting-profile/include/setting-profile-other-sounds.h b/setting-profile/include/setting-profile-other-sounds.h
index dfbf04b..03e7a6b 100644
--- a/setting-profile/include/setting-profile-other-sounds.h
+++ b/setting-profile/include/setting-profile-other-sounds.h
@@ -21,15 +21,9 @@
 #include <stdbool.h>
 
 bool setting_profile_other_sound_touch_sound_enabled();
-
 void setting_profile_other_sound_enable_touch_sound(bool val);
 
-bool setting_profile_other_sound_screen_lock_sound_enabled();
-
-void setting_profile_other_sound_enable_screen_lock_sound(bool val);
-
 bool setting_profile_other_sound_keyboard_sound_enabled();
-
 void setting_profile_other_sound_enable_keyboard_sound(bool val);
 
 #endif /* end of include guard: SETTING_PROFILE_OTHER_SOUNDS_H */
diff --git a/setting-profile/src/setting-profile-other-sounds-view.c b/setting-profile/src/setting-profile-other-sounds-view.c
index 0a4400a..cab8290 100644
--- a/setting-profile/src/setting-profile-other-sounds-view.c
+++ b/setting-profile/src/setting-profile-other-sounds-view.c
@@ -44,10 +44,6 @@ static struct item items[] = {
 		"Touch sound", "Play sound when making screen selection",
 		setting_profile_other_sound_touch_sound_enabled, setting_profile_other_sound_enable_touch_sound
 	},
-	{
-		"Screen lock sound", "Play sounds when locking and unlocking screen",
-		setting_profile_other_sound_screen_lock_sound_enabled, setting_profile_other_sound_enable_screen_lock_sound
-	},
 	{
 		"Keyboard sound", "Sound feedback for system keyboard",
 		setting_profile_other_sound_keyboard_sound_enabled, setting_profile_other_sound_enable_keyboard_sound
diff --git a/setting-profile/src/setting-profile-other-sounds.c b/setting-profile/src/setting-profile-other-sounds.c
index 690c10f..af8d374 100644
--- a/setting-profile/src/setting-profile-other-sounds.c
+++ b/setting-profile/src/setting-profile-other-sounds.c
@@ -43,16 +43,6 @@ void setting_profile_other_sound_enable_touch_sound(bool val)
 	setting_vconf_set_bool(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, val);
 }
 
-bool setting_profile_other_sound_screen_lock_sound_enabled()
-{
-	return setting_vconf_get_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL);
-}
-
-void setting_profile_other_sound_enable_screen_lock_sound(bool val)
-{
-	setting_vconf_set_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, val);
-}
-
 bool setting_profile_other_sound_keyboard_sound_enabled()
 {
 	return setting_vconf_get_bool(VCONFKEY_SETAPPL_BUTTON_SOUNDS_BOOL);