disable haptic related code
authorHyejin Kim <hyejin0906.kim@samsung.com>
Fri, 19 Oct 2012 06:01:05 +0000 (15:01 +0900)
committerHyejin Kim <hyejin0906.kim@samsung.com>
Tue, 23 Oct 2012 11:00:01 +0000 (20:00 +0900)
Change-Id: I4f6617a40395ba9e2571eef66e2d39f489a0c665

setting-profile/include/setting-profile.h
setting-profile/src/setting-profile-sound-main.c
setting-profile/src/setting-profile.c

index f44317b..990213d 100755 (executable)
@@ -37,6 +37,8 @@
 #include <setting-common-view.h>
 #include <pthread.h>
 
+#define MIGRATION_HAPTIC 0
+
 #define HAPTIC_TEST_ITERATION 1
 #define VOLUME_DEN (15.0)      /* ie equals float(SETTING_SOUND_VOL_MAX) */
 
index 2dce560..aeee6d0 100755 (executable)
@@ -113,6 +113,7 @@ void __sound_sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
                elm_genlist_item_update(data_parentItem->item);
        }
 
+#if MIGRATION_HAPTIC
        if (data_parentItem->int_slp_setting_binded ==
            INT_SLP_SETTING_CALL_ALERT_VIB) {
                if (device_haptic_stop_play(ad->hnd_hpt) != 0) {
@@ -123,6 +124,7 @@ void __sound_sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
                                               setting_profile_get_call_playing_vib_by_vconf_value
                                               (data_subItem->chk_status));
        }
+#endif
 }
 
 static void __sound_exp_cb(void *data, Evas_Object *obj, void *event_info)
@@ -734,10 +736,12 @@ static void __view_change_cb(void *data, Evas_Object *obj, void *event_info)
 
        SettingProfileUG *ad = (SettingProfileUG *) data;
 
+#if MIGRATION_HAPTIC
        if (device_haptic_stop_play(ad->hnd_hpt) != 0) {
                SETTING_TRACE("ERROR device_haptic_stop_play");
                /* return; */
        }
+#endif
        setting_profile_close_all_mm_players(ad);
 
        Evas_Object *sub_view = NULL;
@@ -746,8 +750,6 @@ static void __view_change_cb(void *data, Evas_Object *obj, void *event_info)
        ret_if(!tab_lable);
        //SETTING_TRACE("tab_lable:%s", tab_lable);
        if (0 == safeStrCmp(tab_lable, VOLUME_STR)) {
-               if(ad->hnd_hpt)
-                       device_haptic_stop_play(ad->hnd_hpt);
                sub_view = __get_main_list(ad);
        } else if (0 == safeStrCmp(tab_lable, RINGTONE_STR)) {
                sub_view = __get_ringtone_list(ad);
@@ -892,12 +894,13 @@ setting_profile_sound_main_click_softkey_cancel_cb(void *data,
 
        /* close mm plaer */
        setting_profile_close_all_mm_players(ad);
+#if MIGRATION_HAPTIC
        /* close vibration */
        if (device_haptic_stop_play(ad->hnd_hpt) != 0) {
                SETTING_TRACE("ERROR device_haptic_stop_play");
                /* return; */
        }
-
+#endif
        /* Send destroy request */
        ug_destroy_me(ad->ug);
 
@@ -1103,7 +1106,9 @@ setting_profile_sound_main_Gendial_chk_cb(void *data, Evas_Object *obj,
                        setting_disable_genlist_item(ad->data_media_volume->item);
                        setting_disable_genlist_item(ad->data_touch_volume->item);
                }
-       } else if (!safeStrCmp(SETTING_SOUND_TEXT_VIBRATION, list_item->keyStr)) {
+       }
+#if MIGRATION_HAPTIC
+       else if (!safeStrCmp(SETTING_SOUND_TEXT_VIBRATION, list_item->keyStr)) {
                if (vconf_set_bool(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, list_item->chk_status) < 0) {
                        list_item->chk_status = !state;
                        elm_check_state_set(list_item->eo_check, list_item->chk_status);
@@ -1129,6 +1134,7 @@ setting_profile_sound_main_Gendial_chk_cb(void *data, Evas_Object *obj,
                        setting_disable_genlist_item(ad->data_touch_vib->item);
                }
        }
+#endif
        /* additional items */
        else if (!safeStrCmp(SETTING_SOUND_TEXT_LOCK_SOUND, list_item->keyStr)) {
                if (vconf_set_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, list_item->chk_status) < 0) {
@@ -1163,8 +1169,10 @@ setting_profile_sound_main_mouse_up_Gendial_list_cb(void *data,
 
        SettingProfileUG *ad = data;
 
+#if MIGRATION_HAPTIC
        if(ad->hnd_hpt)
                        device_haptic_stop_play(ad->hnd_hpt);
+#endif
 
        SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
        if (!safeStrCmp(SETTING_SOUND_TEXT_CALL_RINGTONE, list_item->keyStr)
index 91dc6d5..ae84255 100755 (executable)
@@ -28,8 +28,6 @@
 #define UG_MODULE_API __attribute__ ((visibility("default")))
 #endif
 
-#define MIGRATION_HAPTIC 0
-
 SettingProfileUG *g_ProfileUG = NULL;  /*  just a handler */
 
 static void setting_profile_ug_cb_resize(void *data, Evas *e,