SDB is enabled with debug mode
authorTaeyoung Kim <ty317.kim@samsung.com>
Mon, 19 Nov 2012 07:00:55 +0000 (16:00 +0900)
committerTaeyoung Kim <ty317.kim@samsung.com>
Mon, 19 Nov 2012 07:00:55 +0000 (16:00 +0900)
packaging/org.tizen.setting.spec
packaging/settings.changes
setting-common/include/setting-common-general-func.h
setting-common/src/setting-common-general-func.c
setting-connectivity/include/setting-connectivity-usb.h
setting-connectivity/include/setting-connectivity.h
setting-connectivity/src/setting-connectivity-usb.c
setting-connectivity/src/setting-connectivity.c

index f8f6422..d3b7134 100755 (executable)
@@ -124,6 +124,7 @@ GOPTION="-g 6514"
        vconftool $GOPTION set -t int memory/setting/usb_mode "-1" -i -f
        vconftool $GOPTION set -t int memory/setting/usb_sel_mode "0" -i -f
        vconftool $GOPTION set -t int memory/setting/usb_in_mode_change "0" -i -f
+       vconftool $GOPTION set -t bool db/setting/debug_mode "0" -f
 
 #resetSound
        DEFAULT_CALL_TONE="/opt/share/settings/Ringtones/ringtone_sdk.mp3"
index 35b4c19..670bfc8 100644 (file)
@@ -1,3 +1,6 @@
+* Tue Nov  19 2012 Taeyoung Kim <ty317.kim@samsung.com>
+- SDB is enabled when debug mode is on
+
 * Tue Nov  6 2012 Jing Yigang <yigang.jing@samsung.com>
 - Release
 
index 05b54f0..971e3f8 100755 (executable)
@@ -56,7 +56,6 @@
 extern char *setting_file_basename(char *path);
 
 /*****/
-extern char *get_pa_usb_connect_mode_str();
 extern char *get_brightness_mode_str();
 extern char *get_pa_backlight_time_str();
 extern char *get_pa_powersaving_at_str();
index 06e4acd..4dbc53b 100755 (executable)
@@ -45,23 +45,6 @@ char *setting_file_basename(char *path)
        return (char *)g_strdup(p + 1);
 }
 
-char *get_pa_usb_connect_mode_str()
-{
-       int ret = SETTING_RETURN_FAIL;
-       int value;
-
-       ret = vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT, &value);
-       setting_retvm_if(SETTING_RETURN_FAIL == ret, NULL, "Failed to get vconf value");        /* file system exceptional handle */
-
-       switch (value)
-       {
-       case SETTING_USB_DEBUG_MODE:
-               return (char*)g_strdup(_("IDS_ST_BODY_USB_DEBUGGING"));
-       default:
-               return (char*)g_strdup(_("IDS_COM_POP_DISCONNECTED"));
-       }
-}
-
 char *get_brightness_mode_str()
 {
        int value, err;
index 56c4bfc..88434c5 100755 (executable)
 #include <setting-connectivity.h>
 #include <devman.h>
 
-#define NUM_PROGRESSBAR 4
-
 #define SETTING_USB_DEBUGGING_DESC "IDS_ST_BODY_DEBUGGING_MODE_LAUNCHES_WHEN_USB_IS_CONNECTED"
 
-enum progressbar_status {
-       STATE_NONE = 0x00,
-       STATE_PROGRESSBAR
-};
-
-typedef struct _button_status button_status;
-
-struct _button_status {
-       Evas_Object *progressbar;       /*  progressbar */
-       Elm_Object_Item *item;  /*  button */
-       int pstate;             /*  progressbar status to show or hide */
-};
-
 static void setting_connectivity_usb_click_softkey_cancel_cb(void *data,
                                                             Evas_Object *obj,
                                                             void *event_info);
index afd497c..497286e 100755 (executable)
@@ -42,12 +42,6 @@ enum mode_change {
        IN_MODE_CHANGE_NONE
 };
 
-enum usb_connection_status {
-       USB_DISCONNECTED = 0,
-       USB_CONNECTED,
-       GETTING_STATUS_FAIL
-};
-
 typedef struct _SettingConnectivityUG SettingConnectivityUG;
 
 /**
@@ -89,7 +83,6 @@ struct _SettingConnectivityUG {
        Elm_Genlist_Item_Class itc_2text_3_parent;
        Elm_Genlist_Item_Class itc_1icon_1text_sub;
 
-       int noti_fd;
        Eina_Bool blockUI;
 #ifdef SUPPORT_MDM
        mdm_status_t curMdmPolicy;
@@ -101,7 +94,5 @@ struct _SettingConnectivityUG {
 extern setting_view setting_view_connectivity_usb;
 extern setting_view setting_view_connectivity_usb_help;
 
-int check_usb_jack_status();
-void set_usb_mode_default();
 
 #endif                         /* __SETTING_CONNECTIVITY_H__ */
index 354bac3..dffcc07 100755 (executable)
  *
  */
 #include <setting-connectivity-usb.h>
-#define GROUP_MAX      30
-#define MDM_POLICY_RESTRICTED \
-       "MDM policy restricts connecting Samsung Kies mode."
-#define USB_BTN_NO  0
-#define SETTING_USB_MDM_RESTRICTED 10
+
+#define DEBUG_MODE_POPUP_TEXT \
+       "USB debugging is intended for development purposes only. " \
+       "It can be used to copy data between your computer and your " \
+       "device, install application on your device without " \
+       "notification, and read log data"
 
 static char* bgprocess_list[] = {
     "IDS_ST_HEADER_STANDARD_LIMIT_ABB",
@@ -39,22 +40,10 @@ static int setting_connectivity_usb_destroy(void *cb);
 static int setting_connectivity_usb_update(void *cb);
 static int setting_connectivity_usb_cleanup(void *cb);
 
-static void current_mode_change_vconf_cb(keynode_t *key, void *data);
+static void debug_mode_change_vconf_cb(keynode_t *key, void *data);
 static void in_mode_change_vconf_cb(keynode_t *key, void *data);
-static void set_progressbar_status (int mode);
-static void unset_progressbar_status (int mode);
-static void select_popup_btn_vconf_cb(keynode_t *key, void *data);
-static void usb_chgdet_cb(runtime_info_key_e key, void *data);
 static void unload_popup(void* data);
 void load_usb_connection_popup(void* data);
-void load_usb_disabled_popup(int mode);
-
-/* This is pointer to indicate progressbars*/
-static button_status button[NUM_PROGRESSBAR];
-
-/* This variable shows the current/selected USB mode */
-static int g_curMode;                          // INT_SLP_SETTING_USB_MODE                                     R
-static int g_selMode;                          // VCONFKEY_SETAPPL_USB_SEL_MODE_INT            R/W
 
 /* These variables are for the popup */
 static Evas_Object *win_main, *popup_eo;
@@ -67,312 +56,68 @@ setting_view setting_view_connectivity_usb = {
        .cleanup = setting_connectivity_usb_cleanup,
 };
 
-/**
- * This function is for adding buttons with a subtitle or a progressbar
- */
-Elm_Object_Item *setting_create_Gendial_field_group_item_1text_1icon(Evas_Object * genlist,
-                                                                setting_call_back_func gl_sel,
-                                                                SettingConnectivityUG *sel_data,
-                                                                SWALLOW_Type swallow_type,
-                                                                int chk_status,
-                                                                const char *keyStr,
-                                                                int index)
+static int setting_connectivity_change_debug_mode_toggle(SettingConnectivityUG *ad)
 {
        SETTING_TRACE_BEGIN;
-       Setting_GenGroupItem_Data *item_data = (Setting_GenGroupItem_Data *) calloc(1, sizeof (Setting_GenGroupItem_Data));
-
-       item_data->keyStr = (char *)g_strdup(keyStr);
-       item_data->swallow_type = swallow_type;
-       item_data->chk_status = chk_status;
-       item_data->usb_index = index;
-       item_data->sub_desc = (char *)g_strdup(_("IDS_COM_POP_CONNECTED"));
-
-       /* If current mode is the mode of this button, the genlist appended should be with subtext "Connected"
-        * If not, the genlist should be with single text */
-       SETTING_TRACE("g_curMode: %d, index : %d\n", g_curMode, index);
+       if(!ad) return -1;
 
-#if DISABLED_CODE
-       if (g_curMode == index)
-       {
-
-               //      setting_create_Gendial_itc("dialogue/1text.1icon", &(connectiveUG->itc_1text_1icon_gen));       /* toggle */
-               item_data->item = elm_genlist_item_append(genlist, &(sel_data->itc_2text_3), item_data, NULL,
-                                   ELM_GENLIST_ITEM_NONE, gl_sel, sel_data);
+       int ret = -1;
+       int debugMode = 0;
+       ret = vconf_get_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, &debugMode);
+       if (ret != 0) {
+               SETTING_TRACE("FAIL: vconf_get_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL)");
+               return -1;
        }
-       else /* g_curMode is concerned with other button */
-       {
-               item_data->item = elm_genlist_item_append(genlist, &(sel_data->itc_1text_1icon), item_data, NULL, ELM_GENLIST_ITEM_NONE, gl_sel, sel_data);
+       SETTING_TRACE("debugMode: %d", debugMode);
 
+       elm_check_state_set(ad->debug_mode->eo_check, EINA_FALSE);
+       if (debugMode == 0) {
+               load_usb_connection_popup(ad);
+       } else {
+               ret = vconf_set_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, 0);
+               if (ret != 0) {
+                       SETTING_TRACE("FAIL: vconf_set_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL)");
+                       return -1;
+               }
        }
-#endif
-       //Elm_Genlist_Item_Class itc_1text_1icon_gen;
-       item_data->item = elm_genlist_item_append(genlist,
-                                                                                       &(sel_data->itc_1text_1icon),
-                                                                                       item_data,
-                                                                                       NULL,
-                                                                                       ELM_GENLIST_ITEM_NONE,
-                                                                                       gl_sel,
-                                                                                       sel_data);
 
        SETTING_TRACE_END;
-       return item_data->item;
+       return 0;
 }
 
-/**
- * Creating progressbar
- *
- *@param parent
- *@param num
- *
- *@return
- */
-Evas_Object *create_progressbar(Evas_Object *parent, int num)
+static void setting_connectivity_main_chk_usb_debug_cb(void *data,
+                                               Evas_Object * obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
-       button[num].progressbar = elm_progressbar_add(parent);
-       elm_object_style_set(button[num].progressbar, "list_process");
-       evas_object_size_hint_align_set(button[num].progressbar, EVAS_HINT_FILL,
-                                       0.5);
-       evas_object_size_hint_weight_set(button[num].progressbar,
-                                        EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(button[num].progressbar);
-       elm_progressbar_pulse(button[num].progressbar, EINA_TRUE);
-       SETTING_TRACE_END;
-       return button[num].progressbar;
-}
+       retm_if(data == NULL, "Data parameter is NULL");
+       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
+       SettingConnectivityUG *ad = list_item->userdata;
 
-/**
- * This function set the icons: a progressbar
- *
- *@param data
- *@param obj
- *@param part
- *
- *@return
- */
-Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part)
-{
-       SETTING_TRACE_BEGIN;
-       Setting_GenGroupItem_Data *item_data =
-           (Setting_GenGroupItem_Data *) data;
-       Evas_Object *icon = NULL;
-       /* The number of icon is 1, so we should use "elm.icon" instead of "elm.icon.2" */
-       if (!strncmp(part, "elm.icon", sizeof("elm.icon"))) {
-               switch (button[item_data->usb_index].pstate) {
-               case STATE_PROGRESSBAR:
-                       icon = create_progressbar(obj, item_data->usb_index);
-               case STATE_NONE:
-               default:
-                       break;
-               }
-       }
-       SETTING_TRACE_END;
-       return icon;
-}
-
-
-static void setting_connectivity_popup_cb(void *data, Evas_Object *obj,
-                    void *event_info)
-{
-    SETTING_TRACE_BEGIN;
-    int response_type = btn_type(obj);
-       int ret;
-
-    SettingConnectivityUG *ad = data;
-
-    if (POPUP_RESPONSE_OK == response_type) {
-        // OK
-               // set vconf
-               SETTING_TRACE("keeping_debug: SET\n");
-               ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEBUG_MODE);
-
-               elm_check_state_set(ad->debug_mode->eo_check, 1);
-               ad->debug_mode->chk_status = 1;
-    } else if (POPUP_RESPONSE_CANCEL == response_type) {
-        // NO
-               SETTING_TRACE("keeping_debug: UNSET\n");
-               ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE);
-
-               // set to zero
-               elm_check_state_set(ad->debug_mode->eo_check, 0);
-               ad->debug_mode->chk_status = 0;
-    }
-
-    if (ad->pop) {
-        evas_object_del(ad->pop);
-        ad->pop = NULL;
-    }
-}
-
-
-static void setting_connectivity_main_chk_usb_debug_cb(void *data, Evas_Object * obj, void *event_info)
-{
-    SETTING_TRACE_BEGIN;
-    //error check
-    retm_if(data == NULL, "Data parameter is NULL");
-    SettingConnectivityUG *ad = NULL;
-
-    Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
-    ad = list_item->userdata;
-
-       // jack_connected? --> process
-       // NOT jack_connected? --> popup and skip
-       if (USB_DISCONNECTED == check_usb_jack_status())
-       {
-               switch (g_selMode)
-               {
-               case SETTING_USB_DEFAULT_MODE:
-                       /* not USB debug mode */
-                       load_usb_connection_popup(ad);
-                       break;
-               default:
-                       break;
-               }
-
-               // set default state
-               //int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE);
-               //setting_retm_if(ret != 0, "fail to set vconf");
-               elm_check_state_set(ad->debug_mode->eo_check, 0);
+       if (0 > setting_connectivity_change_debug_mode_toggle(ad)) {
+               SETTING_TRACE("FAIL: setting_connectivity_change_debug_mode_toggle()");
        }
-       else    /* USB_CONNECTED == check_usb_jack_status() */
-       {
-               SETTING_TRACE("ad->blockUI: EINA_TRUE\n");
-               ad->blockUI = EINA_TRUE;
-
-               list_item->chk_status = elm_check_state_get(obj);   // for genlist update status
-               int opposite  = (list_item->chk_status == 1) ? SETTING_ON_OFF_BTN_ON : SETTING_ON_OFF_BTN_OFF;
 
-               if (opposite) {
-                       // off --> on
-                       // create popup
-                       ad->pop = setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                       _("USB Debugging mode on"), setting_connectivity_popup_cb, 0, 2,
-                                       dgettext("sys_string", "IDS_COM_SK_OK"),
-                                       _("IDS_COM_SK_CANCEL"));
-               } else {
-                       // set default state
-                       int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE);
-                       setting_retm_if(ret != 0, "fail to set vconf");
-                       elm_check_state_set(ad->debug_mode->eo_check, 0);
-               }
-       }
+       SETTING_TRACE_END;
 }
 
-/**
- * Do process when clicking on some genlist item
- *
- *@param data
- *@param obj
- *@param event_info
- */
 static void setting_connectivity_usb_mouse_up_Gendial_list_cb(void *data,
-                                                                   Evas_Object *obj, void *event_info)
+                                                   Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
-
-       /* error check */
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
+       retm_if(data == NULL, "Invalid argument: data is NULL");
+       retm_if(event_info == NULL, "Invalid argument: event_info is NULL");
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
-       elm_genlist_item_selected_set(item, 0);
-       Setting_GenGroupItem_Data *list_item =
-           (Setting_GenGroupItem_Data *) elm_object_item_data_get(item);
-
-#if DISABLED_CODE/*{{{*/
-       int ret;
-
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       SettingConnectivityUG *ad = (SettingConnectivityUG *) data;
-
-       /* (ad->blockUI == EINA_TRUE) : When clicking a btn, do nothing
-        * (ad->blockUI == EINA_FALSE) : When clicking a btn, change usb mode */
-       if ( EINA_TRUE == ad->blockUI )
-       {
-               SETTING_TRACE("Currently, USB mode is changing\n");
-               return;
-       }
-
-       /* If selected mode is same as the previous mode, do nothing */
-       if (g_curMode == list_item->chk_status)
-       {
-               SETTING_TRACE("Selected mode is same as the previous mode\n");
-               return ;
-       }
-
-       SETTING_TRACE("list_item->chk_status: %d\n", list_item->chk_status);
-
-       g_selMode = list_item->chk_status;
-       ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, g_selMode);
-       setting_retm_if ( ret != 0, "FAIL: vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT)\n");
-
-       /* if the USB cable is not connected and the selected mode is not the KIES mode,
-        * popup should be loaded to ask connecting the USB cable */
-       if (USB_DISCONNECTED == check_usb_jack_status())
-       {
-               switch (g_selMode)
-               {
-               case SETTING_USB_DEBUG_MODE:
-               default:
-                       load_usb_connection_popup(ad);
-                       break;
-               }
-       }
-       else    /* USB_CONNECTED == check_usb_jack_status() */
-       {
-               SETTING_TRACE("ad->blockUI: EINA_TRUE\n");
-               ad->blockUI = EINA_TRUE;
-       }
-       SETTING_TRACE("ad->blockUI: %d\n", ad->blockUI);
-#endif/*}}}*/
-
-       SettingConnectivityUG *ad = (SettingConnectivityUG *) data;
-
-       if (USB_DISCONNECTED == check_usb_jack_status())
-       {
-               switch (g_selMode)
-               {
-               case SETTING_USB_DEFAULT_MODE:
-                       /* not USB debug mode */
-                       load_usb_connection_popup(ad);
-                       break;
-               default:
-                       break;
-               }
+       SettingConnectivityUG *ad = (SettingConnectivityUG *)data;
 
-               // set default state
-               int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE);
-               setting_retm_if(ret != 0, "fail to set vconf");
-               elm_check_state_set(list_item->eo_check, 0);
-       }
-       else    /* USB_CONNECTED == check_usb_jack_status() */
-       {
-               SETTING_TRACE("ad->blockUI: EINA_TRUE\n");
-               ad->blockUI = EINA_TRUE;
+       elm_genlist_item_selected_set(item, 0);
 
-               int old_status = elm_check_state_get(list_item->eo_check);
-               /* 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) {
-                       // off --> on
-                       // create popup
-                       elm_check_state_set(list_item->eo_check, list_item->chk_status);
-                       ad->pop = setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                       _("USB Debugging mode on"), setting_connectivity_popup_cb, 0, 2,
-                                       dgettext("sys_string", "IDS_COM_SK_OK"),
-                                       _("IDS_COM_SK_CANCEL"));
-               } else {
-                       // set default state
-                       int ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE);
-                       setting_retm_if(ret != 0, "fail to set vconf");
-                       elm_check_state_set(list_item->eo_check, 0);
-               }
+       if (0 > setting_connectivity_change_debug_mode_toggle(ad)) {
+               SETTING_TRACE("FAIL: setting_connectivity_change_debug_mode_toggle()");
        }
 
        SETTING_TRACE_END;
 }
 
-
 char* get_bg_processes()
 {
        int value;
@@ -409,7 +154,6 @@ static int setting_connectivity_usb_create(void *cb)
 
        int vconf_ret = -1;
        int err = -1;
-       int jack_status = USB_DISCONNECTED;
 
        /* win_main of the popup */
        win_main = ad->win_get;
@@ -439,33 +183,6 @@ static int setting_connectivity_usb_create(void *cb)
 
        SETTING_TRACE("before init\n");
 
-       button[SETTING_USB_DEBUG_MODE].item = NULL;
-       button[SETTING_USB_DEBUG_MODE].pstate = STATE_NONE;
-
-       /* icon of itc_1text_1icon is progressbar */
-       ad->itc_1text_1icon.func.content_get = _gl_icon_get;
-
-       jack_status = check_usb_jack_status();
-       /* Set g_curMode and g_selMode which are internal variables */
-       if ( jack_status == USB_CONNECTED)
-       {
-               setting_get_int_slp_key(INT_SLP_SETTING_USB_MODE, &g_curMode, &err);
-               if (err != 0)
-               {
-                       SETTING_TRACE("FAIL: setting_get_int_slp_key(INT_SLP_SETTING_USB_MODE)\n");
-                       return SETTING_RETURN_FAIL;
-               }
-       }
-       else    /* USB cable is not connected */
-               g_curMode = SETTING_USB_NONE_MODE;
-
-       err = vconf_get_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, &g_selMode);
-       if (err != 0)
-       {
-               SETTING_TRACE("FAIL: vconf_get_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT)\n");
-               return SETTING_RETURN_FAIL;
-       }
-
        Elm_Object_Item *item = NULL;;
 #if 1
        // [UI] separator
@@ -474,29 +191,16 @@ static int setting_connectivity_usb_create(void *cb)
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        // [UI] USB debugging
-#if DISABLED_CODE
-       button[SETTING_USB_DEBUG_MODE].item =
-           setting_create_Gendial_field_group_item_1text_1icon(scroller,
-                                                          setting_connectivity_usb_mouse_up_Gendial_list_cb,
-                                                          ad,
-                                                          SWALLOW_Type_INVALID,
-                                                          SETTING_USB_DEBUG_MODE,
-                                                          _("IDS_ST_BODY_USB_DEBUGGING"),
-                                                          SETTING_USB_DEBUG_MODE);
-#else
-       int ret = -1;
        int vconf_val;
        int toggle_dbg = 0;
 
-       // VCONFKEY_SETAPPL_USB_SEL_MODE_INT -> set state
-       // VCONFKEY_SETAPPL_USB_MODE_INT     -> get state
-
-       /* Setting g_selMode and g_curMode */
-       ret = vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT, &vconf_val);
-       if ( (ret == 0) && (vconf_val == 3) )
+       err = vconf_get_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, &toggle_dbg);
+       if (err != 0) {
+               SETTING_TRACE_ERROR("FAIL: vconf_get_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL)");
+               /* set debug mode to true to find the problem*/
                toggle_dbg = 1;
-       else
-               toggle_dbg = 0;
+       }
+       SETTING_TRACE("toggle_dbg: %d", toggle_dbg);
 
        ad->debug_mode =
                setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon_gen),
@@ -507,7 +211,6 @@ static int setting_connectivity_usb_create(void *cb)
 
        if (ad->debug_mode) {
                ad->debug_mode->userdata = ad;
-               button[SETTING_USB_DEBUG_MODE].item = ad->debug_mode->item;
        } else {
                SETTING_TRACE_ERROR("ad->debug_mode is NULL");
                return SETTING_RETURN_FAIL;
@@ -521,43 +224,25 @@ static int setting_connectivity_usb_create(void *cb)
 
        SETTING_TRACE("Second item of Second group is set\n");
 
-#endif
-
        //----------------------------------------------------------------------------------------------
        /* Registering callback function for VCONFKEY_SETAPPL_USB_MODE_INT */
-       vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT, current_mode_change_vconf_cb, ad);
+       vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL,
+                                               debug_mode_change_vconf_cb, ad);
        if(vconf_ret != 0)
        {
-               SETTING_TRACE("FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT)\n");
+               SETTING_TRACE("FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL)");
                return SETTING_RETURN_FAIL;
        }
 
        /* Registering callback function for VCONFKEY_SETAPPL_USB_IN_MODE_CHANGE */
-       vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_IN_MODE_CHANGE, in_mode_change_vconf_cb, ad);
+       vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_IN_MODE_CHANGE,
+                                               in_mode_change_vconf_cb, ad);
        if(vconf_ret != 0)
        {
                SETTING_TRACE("FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_IN_MODE_CHANGE)\n");
                return SETTING_RETURN_FAIL;
        }
 
-       /* Registering callback function for VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT */
-       vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT, select_popup_btn_vconf_cb, ad);
-       if(vconf_ret != 0)
-       {
-               SETTING_TRACE("FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT)\n");
-               return SETTING_RETURN_FAIL;
-       }
-
-       /* Registering callback function for VCONFKEY_SYSMAN_USB_STATUS */
-       err = runtime_info_set_changed_cb(RUNTIME_INFO_KEY_USB_CONNECTED, usb_chgdet_cb, ad);
-       if(err != RUNTIME_INFO_ERROR_NONE)
-       {
-               SETTING_TRACE("FAIL: runtime_info_set_changed_cb(RUNTIME_INFO_KEY_USB_CONNECTED, usb_chgdet_cb, ad)\n");
-               return SETTING_RETURN_FAIL;
-       }
-
-       SETTING_TRACE("g_curMode: %d, g_selMode: %d\n", g_curMode, g_selMode);
-
        int val;
        vconf_ret = vconf_get_int(VCONFKEY_SETAPPL_USB_IN_MODE_CHANGE, &val);
        if (vconf_ret == 0 && val == IN_MODE_CHANGE)
@@ -578,40 +263,6 @@ static int setting_connectivity_usb_create(void *cb)
 }
 
 /**
- * This callback function is called when USB cable is connected or disconnected
- *
- *@param data
- */
-static void usb_chgdet_cb(runtime_info_key_e key, void *data)
-{
-       SETTING_TRACE_BEGIN;
-
-       setting_retm_if(NULL == data, "ERROR:The parameter(data) is NULL\n");
-       SettingConnectivityUG *ad = (SettingConnectivityUG *)data;
-
-       if (USB_DISCONNECTED == check_usb_jack_status())
-       {
-               SETTING_TRACE("USB is disconnected. \n");
-
-               //elm_genlist_item_item_class_update(button[SETTING_USB_DEBUG_MODE].item, &(ad->itc_1text_1icon));
-               if (STATE_PROGRESSBAR == button[SETTING_USB_DEBUG_MODE].pstate)
-               {
-                       button[SETTING_USB_DEBUG_MODE].pstate = STATE_NONE;
-                       //elm_genlist_item_update(button[SETTING_USB_DEBUG_MODE].item);
-               }
-               ad->blockUI = EINA_FALSE;
-       }
-       else    /* USB_CONNECTED == check_usb_jack_status() */
-       {
-               SETTING_TRACE("USB is connected. ad->blockUI = EINA_TRUE\n");
-               ad->blockUI = EINA_TRUE;
-       }
-       unload_popup(ad);
-
-       SETTING_TRACE_END;
-}
-
-/**
  * This callback function is called when USB-setting changes VCONFKEY_SETAPPL_USB_IN_MODE_CHANGE
  *
  *@param data
@@ -628,33 +279,13 @@ static void in_mode_change_vconf_cb(keynode_t *key, void *data)
 
        ret = vconf_get_int(VCONFKEY_SETAPPL_USB_IN_MODE_CHANGE, &in_mode_change);
        setting_retm_if (ret != 0, "vconf_get_int(VCONFKEY_SETAPPL_USB_IN_MODE_CHANGE\n");
-       ret = vconf_get_int (VCONFKEY_SETAPPL_USB_SEL_MODE_INT, &g_selMode);
-       setting_retm_if (ret != 0, "FAIL: vconf_get_int (VCONFKEY_SETAPPL_USB_SEL_MODE_INT\n");
 
        if (CHANGE_COMPLETE == in_mode_change) {
                SETTING_TRACE("ad->blockUI: EINA_FALSE\n");
                ad->blockUI = EINA_FALSE;
        } else if (IN_MODE_CHANGE == in_mode_change) {
-               SETTING_TRACE("USB connection mode is changing\n");
                SETTING_TRACE("ad->blockUI: EINA_TRUE\n");
                ad->blockUI = EINA_TRUE;
-
-               //elm_genlist_item_item_class_update(button[SETTING_USB_DEBUG_MODE].item, &(ad->itc_1text_1icon));
-
-               // toggle
-               if (SETTING_USB_DEBUG_MODE == g_selMode) {
-                       elm_check_state_set(ad->debug_mode->eo_check, 1);
-               } else {
-                       elm_check_state_set(ad->debug_mode->eo_check, 0);
-               }
-
-               // change toggle state
-               if (SETTING_USB_DEBUG_MODE == g_selMode) {
-                       set_progressbar_status(SETTING_USB_DEBUG_MODE);
-               } else {
-                       unset_progressbar_status(SETTING_USB_DEBUG_MODE);
-               }
-               unload_popup(ad);
        } else {
                SETTING_TRACE("Getting in_mode_change failed\n");
        }
@@ -663,67 +294,30 @@ static void in_mode_change_vconf_cb(keynode_t *key, void *data)
 }
 
 /**
- * To set the status of progressbar
- *
- * @param mode
- */
-static void set_progressbar_status (int mode)
-{
-    SETTING_TRACE_BEGIN;
-
-       /* The progressbar of the selected mode is visible */
-       SETTING_TRACE("Loading progressbar on btn of %d\n", mode);
-       button[mode].pstate = STATE_PROGRESSBAR;
-       //elm_genlist_item_update(button[mode].item);
-
-       SETTING_TRACE_END;
-}
-
-/**
- * To unset the status of progressbar
- *
- * @param mode
- */
-static void unset_progressbar_status (int mode)
-{
-    SETTING_TRACE_BEGIN;
-
-       /* All progressbars are invisible */
-       SETTING_TRACE("Unloading progressbar on btn of %d\n", mode);
-       button[mode].pstate = STATE_NONE;
-       //elm_genlist_item_update(button[mode].item);
-
-       SETTING_TRACE_END;
-}
-
-/**
  * When VCONFKEY_SETAPPL_USB_MODE_INT is changed, all buttons are enabled
  *
  *@param key
  *@param data
  */
-static void current_mode_change_vconf_cb(keynode_t *key, void *data)
+static void debug_mode_change_vconf_cb(keynode_t *key, void *data)
 {
        SETTING_TRACE_BEGIN;
        setting_retm_if (NULL == data, "ERROR:The parameter(data) is NULL\n");
        SettingConnectivityUG *ad = (SettingConnectivityUG *)data;
 
        int ret = -1;
+       int debugMode = 0;
+
+       ret = vconf_get_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, &debugMode);
+       setting_retm_if (ret != 0, "ERROR: vconf_get_int(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL)");
+       SETTING_TRACE("debugMode: %d", debugMode);
 
-       /* Get g_curMode and g_selMode */
-       ret = vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT, &g_curMode);
-       setting_retm_if (ret != 0, "ERROR: vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT)");
-       ret = vconf_get_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, &g_selMode);
-       setting_retm_if (ret != 0, "ERROR: vconf_get_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT)");
-       SETTING_TRACE("g_curMode: %d, g_selMode: %d\n", g_curMode, g_selMode);
-
-       unset_progressbar_status(SETTING_USB_DEBUG_MODE);
-       if (SETTING_USB_DEBUG_MODE == g_curMode) {
-               //elm_genlist_item_item_class_update(button[SETTING_USB_DEBUG_MODE].item, &(ad->itc_2text_3));
-               elm_check_state_set(ad->debug_mode->eo_check, 1);
+       if (debugMode == 1) {
+               elm_check_state_set(ad->debug_mode->eo_check, EINA_TRUE);
+       } else if (debugMode == 0) {
+               elm_check_state_set(ad->debug_mode->eo_check, EINA_FALSE);
        } else {
-               //elm_genlist_item_item_class_update(button[SETTING_USB_DEBUG_MODE].item, &(ad->itc_1text_1icon));
-               elm_check_state_set(ad->debug_mode->eo_check, 0);
+               SETTING_TRACE("ERROR: debugMode value is improper");
        }
 
        /* Unblock setting UI */
@@ -734,36 +328,6 @@ static void current_mode_change_vconf_cb(keynode_t *key, void *data)
 }
 
 /**
- * When a button on a popup of USB-syspopup is cllicked, this callback is called
- *
- *@param key
- *@param data
- */
-static void select_popup_btn_vconf_cb(keynode_t *key, void *data)
-{
-       SETTING_TRACE_BEGIN;
-       if(data == NULL)
-       {
-               SETTING_TRACE("ERROR:The parameter(data) is NULL\n");
-               return;
-       }
-       SettingConnectivityUG *ad = (SettingConnectivityUG *)data;
-
-       int ret = -1;
-       int value = -1;
-
-       ret = vconf_get_int(VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT, &value);
-       if (ret != 0)
-       {
-               SETTING_TRACE("FAIL: vconf_get_int(VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT) \n");
-               return ;
-       }
-
-       if (USB_BTN_NO == value) ad->blockUI = EINA_FALSE;
-       SETTING_TRACE_END;
-}
-
-/**
  * To destory the view of usb
  *
  *@param cb
@@ -785,10 +349,11 @@ static int setting_connectivity_usb_destroy(void *cb)
        win_main = NULL;
 
        /* Closing vconf trace */
-       vconf_ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT, current_mode_change_vconf_cb);
+       vconf_ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL,
+                                               debug_mode_change_vconf_cb);
        if (vconf_ret != 0)
        {
-               SETTING_TRACE("FAIL: vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT)\n");
+               SETTING_TRACE("FAIL: vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL)");
                num_err++;
        }
 
@@ -799,20 +364,6 @@ static int setting_connectivity_usb_destroy(void *cb)
                num_err++;
        }
 
-       vconf_ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT, select_popup_btn_vconf_cb);
-       if (vconf_ret != 0)
-       {
-               SETTING_TRACE("FAIL: vconf_ignore_key_changed(VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT)\n");
-               num_err++;
-       }
-
-       vconf_ret = runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_USB_CONNECTED);
-       if (vconf_ret != RUNTIME_INFO_ERROR_NONE)
-       {
-               SETTING_TRACE("FAIL: runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_USB_CONNECTED)\n");
-               num_err++;
-       }
-
        if (ad->ly_usb != NULL) {
                evas_object_del(ad->ly_usb);
                setting_view_connectivity_usb.is_create = 0;
@@ -923,7 +474,6 @@ setting_connectivity_usb_click_softkey_set_cb(void *data, Evas_Object *obj,
 /**
  * unload popup
  */
-//     SettingConnectivityUG *ad = (SettingConnectivityUG *)data;
 static void unload_popup(void* data)
 {
        SETTING_TRACE_BEGIN;
@@ -955,17 +505,21 @@ static void unload_popup(void* data)
 /**
  * Callback function to respond pushing cancel button of the usb connection popup
  */
-static void usb_connection_response_cb(void *data, Evas_Object *obj, void *event_info)
+static void debug_mode_resp_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        int ret = -1;
 
        SettingConnectivityUG *ad = (SettingConnectivityUG *)data;
 
-       g_curMode = SETTING_USB_NONE_MODE;
-       g_selMode = SETTING_USB_DEFAULT_MODE;
-       ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, g_selMode);
-       setting_retm_if(ret != 0, "vconf_set_int(VCONF_SETAPPL_USB_SEL_MODE_INT)\n");
+       int resp_type = btn_type(obj);
+       if (resp_type == POPUP_RESPONSE_OK) {
+               ret = vconf_set_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, 1);
+               if (ret != 0) {
+                       SETTING_TRACE("FAIL: vconf_set_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL)");
+                       return;
+               }
+       }
 
        unload_popup(ad);
        SETTING_TRACE_END;
@@ -982,30 +536,17 @@ void load_usb_connection_popup(void* data)
        SettingConnectivityUG *ad = (SettingConnectivityUG *)data;
 
        unload_popup(ad);
-       switch(g_selMode)
-       {
-       default:
-               popup_msg = _("IDS_ST_POP_CONNECT_TO_PC_USB_DEBUGGING_WILL_BE_DISABLED_AUTOMATICALLY_AFTER_USE");
-               popup_title = _("IDS_ST_BODY_USB_DEBUGGING");
-               // SET TO "DEBUG MODE"
-               //ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEBUG_MODE);
-               break;
-       }
-
-       popup_eo = elm_popup_add(win_main);
-       elm_object_part_text_set(popup_eo, "title,text", popup_title);
-       elm_object_text_set(popup_eo, popup_msg);
-       Evas_Object *btn = setting_create_button(win_main, _("IDS_COM_SK_CANCEL"), NULL, usb_connection_response_cb, ad);
-       elm_object_part_content_set(popup_eo, "button1", btn);
-       elm_object_style_set(btn, "popup_button/default");
-       evas_object_show(popup_eo);
-       popup_msg = NULL;
-       popup_title = NULL;
-
-       if (popup_eo == NULL)
-               SETTING_TRACE(  "ERROR:  ad->popup_eo is NULL \n");
-       if (win_main == NULL)
-               SETTING_TRACE(  "ERROR:  ad->win_main is NULL \n");
+       popup_msg = _(DEBUG_MODE_POPUP_TEXT);
+       popup_title = _("Allow USB debugging?");
+
+       ad->pop = setting_create_popup_with_btn(ad, win_main,//ad->win_get,
+                                       popup_title,
+                                       popup_msg,
+                                       debug_mode_resp_cb,
+                                       0, 2,
+                                       _("IDS_COM_SK_OK"),
+                                       _("IDS_COM_SK_CANCEL"));
+       if (!(ad->pop)) SETTING_TRACE("FAIL: setting_create_popup_with_btn()");
 
        SETTING_TRACE_END;
 }
index 4de0d55..440c160 100755 (executable)
@@ -176,26 +176,6 @@ static void setting_connective_ug_on_destroy(ui_gadget_h ug,
                                ug_get_layout(connectiveUG->ug));
        }
 
-       int ret = check_usb_jack_status();
-       if (ret == USB_CONNECTED)       /* USB cable is connected */
-       {
-               SETTING_TRACE("USB cable is connected\n");
-               /* If kill_apps_popup is loaded, no btn is pushed when Setting is terminated*/
-               ret = vconf_set_int(VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT, USB_BTN_NO);
-               if ( ret != 0)
-               {
-                       SETTING_TRACE("FAIL: vconf_set_int(VCONFKEY_SETAPPL_SELECT_POPUP_BTN_INT)\n");
-               }
-       }
-       else if (ret == USB_DISCONNECTED) /* USB cable is not connected */
-       {
-               SETTING_TRACE("USB cable is not connected\n");
-               set_usb_mode_default();
-       }
-       else
-       {
-               SETTING_TRACE("FAIL: check_usb_jack_status()\n");
-       }
        SETTING_TRACE_END;
 }
 
@@ -307,7 +287,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
 #if SUPPORT_RUN_SYSTEM_COMMAND
                ret += excuteCmd(SETTING_POSTINST_FILE, 1, "usbconnectivity");
 #else
-               ret += vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE);
+               ret += vconf_set_bool(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, 0);
                /* Resetting VCONFKEY_SETAPPL_USB_MODE_INT (current mode) is not necessary.
                 * If USB cable is removed, the key value is SETTING_USB_NONE_MODE by USB-setting.
                 * If USB cable is connected, the key value is changed by selected mode. */
@@ -316,34 +296,3 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
        }
        return ret;
 }
-
-/*****/
-
-/**
- * This function checks the USB connection status
- */
-int check_usb_jack_status()
-{
-       SETTING_TRACE_BEGIN;
-       bool usb_connection = false;
-       int ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_USB_CONNECTED, &usb_connection);
-       if (ret == RUNTIME_INFO_ERROR_NONE && usb_connection == true) {
-               SETTING_TRACE_END;
-               return USB_CONNECTED;   /*  USB is connected */
-       } else {
-               SETTING_TRACE_END;
-               return USB_DISCONNECTED;       /*  USB is disconnected */
-       }
-}
-
-/**
- * This function sets USB mode to KIES mode
- */
-void set_usb_mode_default()
-{
-       SETTING_TRACE_BEGIN;
-       int ret = -1;
-
-       ret = vconf_set_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, SETTING_USB_DEFAULT_MODE);
-       SETTING_TRACE_END;
-}