From: Hyejin Kim Date: Thu, 6 Sep 2012 06:54:54 +0000 (+0900) Subject: remove vibration menu X-Git-Tag: 2.0_alpha~21^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a73297f256ee6bb4a3ca0259ff1d9484c317c24;p=apps%2Fcore%2Fpreloaded%2Fsettings.git remove vibration menu patchset2. remove dependency Change-Id: If783ac8f4ee7a71f29d89da5f1053a5662e89b37 --- diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c index 8d9c117..b0c881a 100755 --- a/setting-profile/src/setting-profile-sound-main.c +++ b/setting-profile/src/setting-profile-sound-main.c @@ -551,21 +551,6 @@ static Evas_Object *__get_main_list(void *data) } else { SETTING_TRACE_ERROR("ad->data_sound is NULL"); } - /* b.use vib */ - if (vconf_get_bool(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, &vconf_value) < 0) - vconf_value = TRUE; /* default value of vibration : on */ - ad->data_vibration = - setting_create_Gendial_field_def(genlist, &(ad->itc_1text_1icon), - setting_profile_sound_main_mouse_up_Gendial_list_cb, - ad, SWALLOW_Type_1TOGGLE, NULL, - NULL, vconf_value, - SETTING_SOUND_TEXT_VIBRATION, NULL, - setting_profile_sound_main_Gendial_chk_cb); - if (ad->data_vibration) { - ad->data_vibration->userdata = ad; - } else { - SETTING_TRACE_ERROR("ad->data_vibration is NULL"); - } (void)setting_create_Gendial_field_titleItem(genlist, &(ad->itc_group_item), @@ -677,59 +662,6 @@ static Evas_Object *__get_main_list(void *data) &(ad->itc_group_item), "IDS_ST_BODY_CALLALERTTYPE_VIBRATION", NULL); - /* f.noti vib */ - if (vconf_get_int(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, &vconf_value) < - 0) - vconf_value = SETTING_DEFAULT_NOTI_VIB_INT; /* default value of notification vibration volume : 5 */ - ad->data_vib_volume = - setting_create_Gendial_field_def(genlist, &(ad->itc_layout), NULL, - NULL, - SWALLOW_Type_LAYOUT_SLIDER, - IMG_VIBRATION_ICON_01, - IMG_VIBRATION_ICON_02, vconf_value, - SETTING_SOUND_TEXT_NOTIFICATION, - NULL, - setting_profile_sound_main_vib_sound_slider_value_change_cb); - if (ad->data_vib_volume) { - ad->data_vib_volume->win_main = ad->win_main_layout; - ad->data_vib_volume->evas = ad->evas; - ad->data_vib_volume->isIndicatorVisible = true; - ad->data_vib_volume->slider_min = 0; - ad->data_vib_volume->slider_max = SETTING_VIB_VOL_MAX; - ad->data_vib_volume->userdata = ad; - ad->data_vib_volume->start_change_cb = __noti_vib_start_change_cb; - ad->data_vib_volume->stop_change_cb = __vibration_stop_change_cb; - ad->data_vib_volume->belongs_to = SETTING_VOL_VIBRATION_GROUP; - } else { - SETTING_TRACE_ERROR("ad->data_vib_volume is NULL"); - } - - /* i.haptic vib */ - if (vconf_get_int - (VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, &vconf_value) < 0) - vconf_value = SETTING_DEFAULT_HAPTIC_VIB_INT; /* default value of haptic vibration volume : 3 */ - ad->data_touch_vib = - setting_create_Gendial_field_def(genlist, &(ad->itc_layout), NULL, - NULL, - SWALLOW_Type_LAYOUT_SLIDER, - IMG_VIBRATION_ICON_01, - IMG_VIBRATION_ICON_02, vconf_value, - "IDS_ST_BODY_SOUNDFEEDBACK_HAPTIC_FEEDBACK", NULL, - setting_profile_sound_main_touchVib_sound_slider_value_change_cb); - if (ad->data_touch_vib) { - ad->data_touch_vib->win_main = ad->win_main_layout; - ad->data_touch_vib->evas = ad->evas; - ad->data_touch_vib->isIndicatorVisible = true; - ad->data_touch_vib->slider_min = 0; - ad->data_touch_vib->slider_max = SETTING_VIB_VOL_MAX; - ad->data_touch_vib->userdata = ad; - ad->data_touch_vib->start_change_cb = __haptic_vib_start_change_cb; - ad->data_touch_vib->stop_change_cb = __vibration_stop_change_cb; - ad->data_touch_vib->belongs_to = SETTING_VOL_VIBRATION_GROUP; - } else { - SETTING_TRACE_ERROR("ad->data_touch_vib is NULL"); - } - setting_create_Gendial_field_def(genlist, &(ad->itc_bg_1icon), NULL, ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, @@ -759,23 +691,6 @@ static Evas_Object *__get_main_list(void *data) elm_genlist_item_select_mode_set(elm_genlist_item_append(genlist, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - /* Screen lock sound */ - if (vconf_get_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, &vconf_value) < 0) - vconf_value = 1; /* default value of lock/unlock sound : on */ - ad->data_lock_sound = - setting_create_Gendial_field_def(genlist, &(ad->itc_1text_1icon), - setting_profile_sound_main_mouse_up_Gendial_list_cb, - ad, SWALLOW_Type_1TOGGLE, NULL, - NULL, vconf_value, - SETTING_SOUND_TEXT_LOCK_SOUND, - NULL, - setting_profile_sound_main_Gendial_chk_cb); - if (ad->data_lock_sound) { - ad->data_lock_sound->userdata = ad; - } else { - SETTING_TRACE_ERROR("ad->data_lock_sound is NULL"); - } - item = elm_genlist_item_append(genlist, &itc_bottom_seperator, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); @@ -1409,44 +1324,6 @@ setting_profile_sound_main_mouse_up_Gendial_list_cb(void *data, } } return; - } else if (!safeStrCmp(SETTING_SOUND_TEXT_VIBRATION, list_item->keyStr)) { - int old_status = elm_check_state_get(list_item->eo_check); - if (vconf_set_bool(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, !old_status) == 0) { - /* new status */ - list_item->chk_status = !old_status; - elm_check_state_set(list_item->eo_check, list_item->chk_status); - if (list_item->chk_status) { - setting_enable_genlist_item(ad->data_vib_volume->item); - setting_enable_genlist_item(ad->data_touch_vib->item); - - /* Play vib if vib turns on */ - int err = 0; - char pattern_file[MAX_COMMON_BUFFER_LEN] = {0,}; - svi_get_path(SVI_TYPE_VIB, SVI_VIB_NOTIFICATION_GENERAL, pattern_file, sizeof(pattern_file)); - device_haptic_stop_play(ad->hnd_hpt); - err = device_haptic_play_file(ad->hnd_hpt, pattern_file, 1, (int)(elm_slider_value_get(ad->data_vib_volume->eo_check)+0.5)); - - if (err < 0) - SETTING_TRACE("Failed to play haptic monotone"); - } else { - if (device_haptic_stop_play(ad->hnd_hpt) != 0) { - SETTING_TRACE("ERROR device_haptic_stop_play"); - } - setting_disable_genlist_item(ad->data_vib_volume->item); - setting_disable_genlist_item(ad->data_touch_vib->item); - } - } - return; - } - /* additional */ - else if (!safeStrCmp(SETTING_SOUND_TEXT_LOCK_SOUND, list_item->keyStr)) { - int old_status = elm_check_state_get(list_item->eo_check); - if (vconf_set_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, !old_status) == 0) { - /* new status */ - list_item->chk_status = !old_status; - elm_check_state_set(list_item->eo_check, list_item->chk_status); - } - return; } else if (!safeStrCmp("IDS_ST_BODY_TOUCH_SOUNDS", list_item->keyStr)) { int old_status = elm_check_state_get(list_item->eo_check); @@ -1456,8 +1333,7 @@ setting_profile_sound_main_mouse_up_Gendial_list_cb(void *data, elm_check_state_set(list_item->eo_check, list_item->chk_status); } /* end */ - else if (ad->data_call_alert_vib == list_item - || ad->data_msg_alert_repeat == list_item + else if (ad->data_msg_alert_repeat == list_item || ad->data_email_alert_repeat == list_item) { bool status = !elm_genlist_item_expanded_get(item); elm_genlist_item_expanded_set(item, status);