[Feature] Hide Network, Date and time > Automatic update, and set the conf of Automat...

Change-Id: I83a664860986a4a8e8b4195adf3d00b04040b067

diff --git a/packaging/settings.spec b/packaging/settings.spec
index e62c770..fae6115 100755 (executable)
Binary files a/packaging/settings.spec and b/packaging/settings.spec differ

diff --git a/setting-network/src/setting-network-main.c b/setting-network/src/setting-network-main.c
index 2dad726..61c6cd8 100755 (executable)
--- a/setting-network/src/setting-network-main.c
+++ b/setting-network/src/setting-network-main.c
@@ -385,61 +385,57 @@ static int setting_network_main_create(void *cb)
                                 "%s. %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
                }
 
-               /* hide SELECT NETWORK in Emulator*/
-               if (!isEmulBin()) {
-                       ad->data_sel_net = setting_create_Gendial_field_def(scroller,
-                                                    &itc_2text_3,
-                                                    setting_network_main_item_Gendial_mouse_up_cb,
-                                                    ad, SWALLOW_Type_INVALID,
-                                                    NULL, NULL, 0,
-                                                    "IDS_ST_BODY_SELECT_NETWORK",
-                                                    sel_network_desc, NULL);
-                       if (ad->data_sel_net) {
-                               ad->data_sel_net->userdata = ad;
-                       } else {
-                               SETTING_TRACE_ERROR("ad->data_sel_net is NULL");
-                       }
+               ad->data_sel_net = setting_create_Gendial_field_def(scroller,
+                                            &itc_2text_3,
+                                            setting_network_main_item_Gendial_mouse_up_cb,
+                                            ad, SWALLOW_Type_INVALID,
+                                            NULL, NULL, 0,
+                                            "IDS_ST_BODY_SELECT_NETWORK",
+                                            sel_network_desc, NULL);
+               if (ad->data_sel_net) {
+                       ad->data_sel_net->userdata = ad;
+               } else {
+                       SETTING_TRACE_ERROR("ad->data_sel_net is NULL");
                }
        }
        /*  ***BEGIN***  Fixed the problem of word twinkle  SAMSUNG 2010/7/21 add */
        /* hide NETWORK MODE in Emulator*/
-       if (!isEmulBin()) {
-               k = vconf_get_int(VCONFKEY_SETAPPL_NETWORK_MODE_INT, &value);
-               if (-1 != k) {
-                       SETTING_TRACE("value:%d", value);
-                       switch (value) {
-                       case TAPI_NETWORK_BAND_TYPE_ANY:
-                               sub_des = _("IDS_COM_BODY_AUTOMATIC");
-                               break;
-                       case TAPI_NETWORK_BAND_TYPE_GSM_900_1800:
-                               sub_des = _(STR_SETTING_GSM_900_1800);
-                               break;
-                       case TAPI_NETWORK_BAND_TYPE_GSM_850_1900:
-                               sub_des = _(STR_SETTING_GSM_850_1900);
-                               break;
-                       case TAPI_NETWORK_BAND_TYPE_WCDMA:
-                               sub_des = _(STR_SETTING_UMTS);
-                               break;
-                       default:
-                               break;
-                       }
+       k = vconf_get_int(VCONFKEY_SETAPPL_NETWORK_MODE_INT, &value);
+       if (-1 != k) {
+               SETTING_TRACE("value:%d", value);
+               switch (value) {
+               case TAPI_NETWORK_BAND_TYPE_ANY:
+                       sub_des = _("IDS_COM_BODY_AUTOMATIC");
+                       break;
+               case TAPI_NETWORK_BAND_TYPE_GSM_900_1800:
+                       sub_des = _(STR_SETTING_GSM_900_1800);
+                       break;
+               case TAPI_NETWORK_BAND_TYPE_GSM_850_1900:
+                       sub_des = _(STR_SETTING_GSM_850_1900);
+                       break;
+               case TAPI_NETWORK_BAND_TYPE_WCDMA:
+                       sub_des = _(STR_SETTING_UMTS);
+                       break;
+               default:
+                       break;
                }
+       }
 
-               ad->data_net_mode =
-                   setting_create_Gendial_exp_parent_field(scroller,
-                                                           &itc_2text_3_parent,
-                                                           NULL, NULL,
-                                                           SWALLOW_Type_INVALID,
-                                                           "IDS_ST_BODY_NETWORK_MODE",
-                                                           sub_des);
-               if (ad->data_net_mode) {
-                       ad->data_net_mode->int_slp_setting_binded =
-                               INT_SLP_SETTING_NETWORK_MODE;
-                       ad->data_net_mode->userdata = ad;
-               } else {
-                       SETTING_TRACE_ERROR("ad->data_back is NULL");
-               }
+       ad->data_net_mode =
+           setting_create_Gendial_exp_parent_field(scroller,
+                                                   &itc_2text_3_parent,
+                                                   NULL, NULL,
+                                                   SWALLOW_Type_INVALID,
+                                                   "IDS_ST_BODY_NETWORK_MODE",
+                                                   sub_des);
+       if (ad->data_net_mode) {
+               ad->data_net_mode->int_slp_setting_binded =
+                       INT_SLP_SETTING_NETWORK_MODE;
+               ad->data_net_mode->userdata = ad;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_back is NULL");
        }
+
        setting_create_Gendial_field_def(scroller, &itc_1text,
                                         setting_network_main_item_Gendial_mouse_up_cb,
                                         ad, SWALLOW_Type_INVALID, NULL, NULL,

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 9551035..2b395d2 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -547,23 +547,25 @@ static int setting_time_main_create(void *cb)
        bool auto_flag = value;
 
        /*  UI automatic */
-       ad->data_auto =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            setting_time_main_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, value,
-                                            "IDS_ST_BODY_AUTOMATIC_UPDATE", NULL,
-                                            setting_time_main_chk_btn_cb);
-       if (ad->data_auto) {
-               ad->data_auto->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_auto is NULL");
-       }
+       if (!isEmulBin()) {
+               ad->data_auto =
+                   setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
+                                                    setting_time_main_mouse_up_Gendial_list_cb,
+                                                    ad, SWALLOW_Type_1TOGGLE, NULL,
+                                                    NULL, value,
+                                                    "IDS_ST_BODY_AUTOMATIC_UPDATE", NULL,
+                                                    setting_time_main_chk_btn_cb);
+               if (ad->data_auto) {
+                       ad->data_auto->userdata = ad;
+               } else {
+                       SETTING_TRACE_ERROR("ad->data_auto is NULL");
+               }
 
-       setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL,
-                                        ad, SWALLOW_Type_LAYOUT_SPECIALIZTION,
-                                        NULL, NULL, 0, SETTING_TIME_AUTO_UPDATE_DESC, NULL,
-                                        NULL);
+               setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL,
+                                                ad, SWALLOW_Type_LAYOUT_SPECIALIZTION,
+                                                NULL, NULL, 0, SETTING_TIME_AUTO_UPDATE_DESC, NULL,
+                                                NULL);
+       }
 
        appcore_set_i18n("worldclock", SETTING_TIME_SHARE_LOCAL_PATH);
 

diff --git a/src/setting-main.c b/src/setting-main.c
index 98383c9..8eec30f 100755 (executable)
--- a/src/setting-main.c
+++ b/src/setting-main.c
@@ -624,7 +624,9 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_
                                        continue; /* hide KeisOverWifi in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Synchronise, keyStr)) {
                                        continue; /* hide Synchronise in Emulator*/
-                               } else {
+                               } else if (!safeStrCmp(KeyStr_Network, keyStr)) {
+                                       continue; /* hide Network in Emulator*/
+                               }else {
                                        /* do nothing */
                                }
                        }