[Feature] hide and remove some menus .
authorJing Yigang <yigang.jing@samsung.com>
Thu, 6 Sep 2012 09:42:41 +0000 (17:42 +0800)
committerJing Yigang <yigang.jing@samsung.com>
Thu, 6 Sep 2012 09:43:10 +0000 (17:43 +0800)
Change-Id: I48eb226711335e3c44a5cc748ca821076df3c0d5

38 files changed:
include/setting-debug.h
include/setting-main.h
include/setting.h
resource/setting.cfg
setting-about/src/setting-about-main.c
setting-common/include/setting-common-data-slp-setting.h
setting-common/include/setting-common-general-func.h
setting-common/include/setting-common-resource.h
setting-common/src/setting-cfg.c
setting-common/src/setting-common-data-slp-setting.c
setting-common/src/setting-common-general-func.c
setting-connectivity/src/setting-connectivity-usb.c
setting-display/CMakeLists.txt
setting-display/include/setting-display.h
setting-display/src/setting-display-main.c
setting-display/src/setting-display-smart-screen.c [deleted file]
setting-display/src/setting-display.c
setting-phone/CMakeLists.txt
setting-phone/include/setting-phone-license-divx-main.h [deleted file]
setting-phone/include/setting-phone-license-divx-mode.h [deleted file]
setting-phone/include/setting-phone-license-main.h [deleted file]
setting-phone/include/setting-phone-ticker-notification-details.h [deleted file]
setting-phone/include/setting-phone-ticker-notification.h [deleted file]
setting-phone/include/setting-phone.h
setting-phone/src/setting-phone-license-divx-main.c [deleted file]
setting-phone/src/setting-phone-license-divx-mode.c [deleted file]
setting-phone/src/setting-phone-license-main.c [deleted file]
setting-phone/src/setting-phone-ticker-notification-details.c [deleted file]
setting-phone/src/setting-phone-ticker-notification.c [deleted file]
setting-phone/src/setting-phone.c
setting-storage/CMakeLists.txt
setting-storage/include/setting-storage-default-storage.h [moved from setting-display/include/setting-display-smart-screen.h with 70% similarity]
setting-storage/include/setting-storage.h
setting-storage/src/setting-storage-default-storage.c [new file with mode: 0755]
setting-storage/src/setting-storage-main.c
setting-storage/src/setting-storage.c
src/setting-main.c
src/setting.c

index 8eccd76..e8c04a8 100755 (executable)
@@ -64,7 +64,6 @@
 // #define SUPPORT_MDM
 
 /*##menu options##*/
-#define SUPPORT_AllShare                       1
 #define SUPPORT_AllShare_Memory                        0
 #define SUPPORT_FMradio                                1
 #define SUPPORT_FONT                           1
 #define SUPPORT_MOTIONS                                1
 #define SUPPORT_POWERSAVING                    1
 #define SUPPORT_RUN_SYSTEM_COMMAND             0
-#define SUPPORT_VOICEINOUT                     1
 #define SUPPORT_STORAGE                                1
 #define SUPPORT_WIFI_DIRECT                     1
-#define SUPPORT_ALLSHARECAST           1
 #define SUPPORT_DATA_USAGE                      0
 #define SUPPORT_SECURITY                       0
-#define SUPPORT_EVENTNOTI                      0
 
 /*#endif*/
 
index f01ba96..223c553 100755 (executable)
@@ -47,9 +47,6 @@ setting_main_click_list_plugin_cb(void *data, Evas_Object *obj,
                                 void *event_info);
 void setting_main_click_list_more_cb(void *data, Evas_Object *obj, void *event_info);
 
-void setting_main_click_list_usb_cb(void *data, Evas_Object *obj,
-                                            void *event_info);
-
 void setting_main_click_list_flight_mode_cb(void *data,
                                                   Evas_Object *obj,
                                                   void *event_info);
index 2f70de9..4399746 100755 (executable)
@@ -47,7 +47,6 @@
 
 #define SETTING_NFC_DESC "IDS_ST_BODY_ALLOW_DATA_EXCHANGE_WHEN_DEVICE_TOUCHES_ANOTHER_DEVICE"
 #define SETTING_WIFI_DIRECT_DESC "IDS_ST_BODY_SET_UP_PEER_TO_PEER_CONNECTIVITY_ABB"
-#define SETTING_KIES_VIA_WIFI_DESC "IDS_ST_BODY_CONNECT_TO_KIES_VIA_WI_FI"
 
 /**
 * @brief
@@ -144,7 +143,6 @@ typedef struct _setting_main_appdata {
        Setting_GenGroupItem_Data *data_wifi;
        Setting_GenGroupItem_Data *data_bt;
        Setting_GenGroupItem_Data *data_rotationMode;
-       Setting_GenGroupItem_Data *data_mobileApp;
 
        Setting_GenGroupItem_Data *data_bright;
 
index a0c7a59..fdee495 100755 (executable)
         "is_resetable" : 1
       },
       {
-        "key_name" : "IDS_MOBILEAP_BODY_TETHERING",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_mobileAP.png",
-        "ug_args" : "setting-mobile-ap-ug",
-        "pos" : 0,
-        "click_times" : 0,
-        "is_resetable" : 1
-      },
-      {
         "key_name" : "IDS_COM_BODY_LOCATION",
         "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_Location.png",
         "ug_args" : "setting-location-efl",
         "pos" : 1,
         "click_times" : 0,
         "is_resetable" : 1
-      },
-      {
-        "key_name" : "Allshare cast",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_Allshare_cast.png",
-        "ug_args" : "setting-allshare-cast-efl",
-        "pos" : 1,
-        "click_times" : 0,
-        "is_resetable" : 0
-      },
-      {
-        "key_name" : "IDS_DLNA_HEADER_NEARBY_DEVICES",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/AllShare.png",
-        "ug_args" : "setting-allshare-efl",
-        "pos" : 1,
-        "click_times" : 0,
-        "is_resetable" : 0
-      },
-      {
-        "key_name" : "IDS_COM_BODY_KIES_VIA_WI_FI",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_Kies_via_Wifi.png",
-        "ug_args" : "kies-via-wifi",
-        "pos" : 1,
-        "click_times" : 0,
-        "is_resetable" : 1
-      },
-      {
-        "key_name" : "IDS_COM_BODY_SYNCHRONIZE",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_ActiveSync.png",
-        "ug_args" : "setting-synchronise-efl",
-        "pos" : 1,
-        "click_times" : 0,
-        "is_resetable" : 1
       }
     ]
   },
         "is_resetable" : 0
       },
       {
-        "key_name" : "IDS_ST_BODY_MOTION",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_Motion.png",
-        "ug_args" : "setting-motion-efl|viewtype:motions",
-        "pos" : 0,
-        "click_times" : 0,
-        "is_resetable" : 0
-      },
-      {
-        "key_name" : "IDS_ST_BODY_ACCESSIBILITY",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/Accessibility.png",
-        "ug_args" : "setting-accessibility-efl",
-        "pos" : 0,
-        "click_times" : 0,
-        "is_resetable" : 0
-      },
-      {
         "key_name" : "IDS_COM_BODY_FONT",
         "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_Font.png",
         "ug_args" : "setting-font-efl",
         "is_resetable" : 1
       },
       {
-        "key_name" : "IDS_ST_HEADER_VOICE_INPUT_AND_OUTPUT",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/VoiceInOut.png",
-        "ug_args" : "setting-voice-efl",
-        "pos" : 1,
-        "click_times" : 0,
-        "is_resetable" : 0
-      },
-      {
-        "key_name" : "IDS_ST_BODY_DRIVING_MODE",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_Driving_mode.png",
-        "ug_args" : "setting-drivingmode-efl",
-        "pos" : 1,
-        "click_times" : 0,
-        "is_resetable" : 1
-      },
-      {
         "key_name" : "IDS_ST_BODY_STORAGE",
         "icon_path" : "/opt/apps/org.tizen.setting/res/icons/DefaultIcon.png",
         "ug_args" : "setting-storage-efl",
     "name" : "IDS_COM_BODY_APPLICATIONS",
     "menu" : [
       {
-        "key_name" : "IDS_COM_BODY_ACCOUNTS",
-        "icon_path" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_Accounts.png",
-        "ug_args" : "setting-myaccount-efl|mode:account_list",
-        "pos" : 0,
-        "click_times" : 0,
-        "is_resetable" : 0
-      },
-      {
         "key_name" : "IDS_COM_BODY_CALL",
         "icon_path" : "/usr/share/icons/default/small/com.samsung.phone.png",
         "ug_args" : "setting-call-efl",
index 7181576..88ff447 100755 (executable)
@@ -74,10 +74,6 @@ static void setting_about_main_mouse_up_Gendial_list_cb(void *data,
                                                        Evas_Object *obj,
                                                        void *event_info);
 
-static void __setting_about_main_mobile_ap_turn_off_ask_resp_cb(void *data,
-                                                   Evas_Object *obj,
-                                                   void *event_info);
-
 static void __setting_about_main_certificates_clicked(void *data);
 static void __setting_about_main_device_name_clicked(void *data, Evas_Object *obj);
 static void __setting_about_main_diagnostics_usage_clicked(void *data, Evas_Object *obj);
@@ -800,16 +796,6 @@ int setting_about_generate_genlist(void *data)
        }
 #endif
 
-#ifdef SUPPORT_FOTA
-       // [UI] Software update
-       if (!is_emul_bin) {
-               setting_create_Gendial_field_def(scroller, &(ad->itc_1text),
-                                        setting_about_main_mouse_up_Gendial_list_cb,
-                                        ad, SWALLOW_Type_INVALID, NULL, NULL,
-                                        0, SOFTWARE_UPDATE_STR,
-                                        NULL, NULL);
-       }
-#endif
        // [UI] Certificates
        // implementation is in progress.
        if (is_ug_installed_by_ug_args("setting-manage-applications-efl"))
@@ -1009,19 +995,6 @@ setting_about_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
                __setting_about_main_device_name_clicked(data, list_item->eo_check);
        } else if (!safeStrCmp(DIAGNOSTICS_USAGE_STR, list_item->keyStr)) {
                __setting_about_main_diagnostics_usage_clicked(data, list_item->eo_check);
-       } else if (!safeStrCmp(SOFTWARE_UPDATE_STR, list_item->keyStr)) {
-#ifdef SUPPORT_FOTA
-               if(aul_app_is_running("com.samsung.oma-dm-ui"))
-               {
-                       SETTING_TRACE_DEBUG("oma-dm-ui is already launched. ");
-                       aul_open_app("com.samsung.oma-dm-ui");
-               }
-               else
-               {
-                       SETTING_TRACE_DEBUG("oma-dm-ui will be launched. ");
-                       aul_launch_app("com.samsung.oma-dm-ui", NULL);
-               }
-#endif
        }
 }
 
@@ -1122,30 +1095,14 @@ static void __setting_about_main_device_name_clicked(void *data, Evas_Object *ob
        retm_if(obj == NULL, "obj parameter is NULL");
        SettingAboutUG *ad = (SettingAboutUG *)data;
 
-       int mobile_ap_status = VCONFKEY_MOBILE_HOTSPOT_MODE_NONE;
-       int err = -1;
-       int ret = setting_get_int_slp_key(INT_SLP_SETTING_MOBILE_AP_STATUS, &mobile_ap_status, &err);
-       //setting_retm_if(ret == SETTING_RETURN_FAIL, "Get vconf failed");
-
        if (!elm_object_focus_get(obj)) {
                elm_object_focus_set(obj, EINA_TRUE);
        }
 
-       if ((mobile_ap_status & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI) && !ad->popup_showed_flag) {
-               if (ad->popup) {
-                       evas_object_del(ad->popup);
-                       ad->popup = NULL;
-               }
-               ad->popup = setting_create_popup_with_btn(ad, ad->win_get,
-                                        NULL, _(SETTING_ABOUT_MOBILE_AP_TURNED_OFF),
-                                        __setting_about_main_mobile_ap_turn_off_ask_resp_cb, 0,
-                                        1, _("IDS_COM_SK_OK"));
-       } else {
-               Ecore_IMF_Context *imf_context = (Ecore_IMF_Context *)elm_entry_imf_context_get(obj);
-               setting_retm_if(imf_context == NULL, "imf_context is NULL");
-               ecore_imf_context_input_panel_event_callback_add(imf_context, ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_event_cb, ad);
-               ecore_imf_context_input_panel_show(imf_context);
-       }
+       Ecore_IMF_Context *imf_context = (Ecore_IMF_Context *)elm_entry_imf_context_get(obj);
+       setting_retm_if(imf_context == NULL, "imf_context is NULL");
+       ecore_imf_context_input_panel_event_callback_add(imf_context, ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_event_cb, ad);
+       ecore_imf_context_input_panel_show(imf_context);
 }
 
 
@@ -1200,31 +1157,3 @@ static void __setting_about_main_diagnostics_usage_clicked(void *data, Evas_Obje
        }
        FREE(cbs);
 }
-
-static void __setting_about_main_mobile_ap_turn_off_ask_resp_cb(void *data,
-                                                   Evas_Object *obj,
-                                                   void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       SettingAboutUG *ad = (SettingAboutUG *)data;
-       int response_type = btn_type(obj);
-
-       if (POPUP_RESPONSE_OK == response_type) {
-               ad->popup_showed_flag = TRUE;
-
-               if (ad->item_dev_name) {
-                       Ecore_IMF_Context *imf_context = elm_entry_imf_context_get(ad->item_dev_name->eo_check);
-                       setting_retm_if(imf_context == NULL, "imf_context is NULL");
-                       ecore_imf_context_input_panel_show(imf_context);
-               }
-       }
-
-       if (ad->popup)
-       {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
-}
-
-
index 7fadd54..d43fb0c 100755 (executable)
@@ -133,7 +133,6 @@ typedef enum {
        INT_SLP_SETTING_LANG,
        INT_SLP_SETTING_BT_STATUS,
        INT_SLP_SETTING_WIFI_STATUS,
-       INT_SLP_SETTING_MOBILE_AP_STATUS,
        INT_SLP_SETTING_ROAMING_NETWORK,
        INT_SLP_SETTING_USB_MODE,
 #ifdef UNUSED_VCONFKEY
index b3406af..7ea3f8a 100755 (executable)
@@ -63,7 +63,6 @@ extern char *get_pa_powersaving_at_str();
 extern char *get_pa_screen_timeout_str();
 extern char *get_pa_display_language_str();
 extern char *get_pa_Wi_Fi_on_off_str();
-extern char *get_Mobile_AP_on_off_str();
 extern char *get_BT_on_off_str();
 extern char *get_NFC_on_off_str();
 
index 7112067..034beb0 100755 (executable)
 #define KeyStr_WiFi                            "IDS_COM_BODY_WI_FI"
 #define KeyStr_WiFiDirect                              "IDS_ST_HEADER_WI_FI_DIRECT"
 #define KeyStr_Bluetooth                       "IDS_COM_BODY_BLUETOOTH"
-#define KeyStr_MobileAP                                "IDS_MOBILEAP_BODY_TETHERING"
 
 #define KeyStr_AllShare                                "IDS_COM_BODY_ALLSHARE"
-#define KeyStr_AllShareCast                            "Allshare cast"
-#define KeyStr_NearbyDevices           "IDS_DLNA_HEADER_NEARBY_DEVICES"
-#define KeyStr_Synchronise                     "IDS_COM_BODY_SYNCHRONIZE"
 
 #define KeyStr_Location                        "IDS_COM_BODY_LOCATION"
 #define KeyStr_Network                         "IDS_ST_BODY_NETWORK"
@@ -74,9 +70,7 @@
 #define KeyStr_Landscape                       "IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB"
 
 #define KeyStr_DateTime                        "IDS_ST_BODY_DATE_AND_TIME"
-#define KeyStr_VoiceInOut              "IDS_ST_HEADER_VOICE_INPUT_AND_OUTPUT"
 #define KeyStr_DisplayLanguage         "IDS_ST_HEADER_DISPLAY_LANGUAGE"
-#define keystr_Drivingmode             "IDS_ST_BODY_DRIVING_MODE"
 
 #define KeyStr_LanguageRegion          "IDS_ST_BODY_LANGUAGE_AND_REGION_ABB"
 
@@ -84,8 +78,6 @@
 #define KeyStr_KeyboradLanguage                "IDS_ST_BODY_KEYBOARD"
 #define KeyStr_Gestures                                "IDS_ST_BODY_GESTURES"
 #define KeyStr_Touch                           "IDS_ST_BODY_TOUCH"
-#define KeyStr_License                         "IDS_ST_BODY_LICENCE"
-#define KeyStr_EventsNotifications     "IDS_ST_BODY_EVENTS_NOTIFICATIONS"
 #define KeyStr_Security                                "IDS_ST_BODY_SECURITY"
 #define KeyStr_Memory                          "IDS_ST_BODY_MEMORY"
 #define KeyStr_Reset                           "IDS_COM_BODY_RESET"
@@ -97,7 +89,6 @@
 
 /* applications keyStr*/
 #define KeyStr_Applications                    "IDS_COM_BODY_APPLICATIONS"
-#define KeyStr_Accounts                                "IDS_COM_BODY_ACCOUNTS"
 
 #define KeyStr_Call                                    "IDS_COM_BODY_CALL"
 #define KeyStr_Gallery                         "IDS_COM_BODY_GALLERY"
 
 /* #define KeyStr_HomeScreen           "Home screen"*/
 #define KeyStr_TaskSwitcher            "IDS_ST_BODY_TASK_SWITCHER"
-#define KeyStr_KeisOverWifi            "IDS_COM_BODY_KIES_VIA_WI_FI"
 #define KeyStr_VoiceRecorder           "IDS_COM_BODY_VOICE_RECORDER"
 #define KeyStr_FMRadio                 "IDS_COM_BODY_FM_RADIO"
 #define KeyStr_Twitter                 "IDS_COM_BODY_TWITTER"
 #define IMG_WiFi                       SETTING_ICON_PATH_CFG"A01-1_icon_Wi-Fi.png"
 #define IMG_WiFiDirect                 SETTING_ICON_PATH_CFG"A01-1_icon_Wi-Fi_direct.png"
 #define IMG_Bluetooth                  SETTING_ICON_PATH_CFG"A01-1_icon_Bluetooth.png"
-#define IMG_MobileAP                   SETTING_ICON_PATH_CFG"A01-1_icon_mobileAP.png"
-#define IMG_AllShare                   SETTING_ICON_PATH_CFG"AllShare.png"
-#define IMG_AllShareCast               SETTING_ICON_PATH_CFG"A01-1_icon_Allshare_cast.png"
-#define IMG_Synchronise                        SETTING_ICON_PATH_CFG"A01-1_icon_ActiveSync.png"
 #define IMG_Location                   SETTING_ICON_PATH_CFG"A01-1_icon_Location.png"
 #define IMG_Network                    SETTING_ICON_PATH_CFG"A01-1_icon_Network.png"
 #define IMG_DataRoaming                        SETTING_ICON_PATH_CFG"A01-1_icon_Data_Roaming.png"
 #define IMG_Powersaving                SETTING_ICON_PATH_CFG"A01-1_icon_Power_saving_mode.png"
 
 #define IMG_DateTime           SETTING_ICON_PATH_CFG"A01-1_icon_Date_and_time.png"
-#define IMG_VoiceInOut         SETTING_ICON_PATH_CFG"VoiceInOut.png"
 #define IMG_DisplayLanguage    SETTING_ICON_PATH_CFG"A01-1_icon_Display_Language.png"
 #define IMG_ChooseDefApps      SETTING_ICON_PATH_CFG"A01-1_icon_Choose_default.png"
 #define IMG_KeyboradLanguage   SETTING_ICON_PATH_CFG"A01-1_icon_keyboard.png"
 #define IMG_Touch              SETTING_ICON_PATH_CFG"Touch.png"
 #define IMG_Motion             SETTING_ICON_PATH_CFG"A01-1_icon_Motion.png"
 #define IMG_License            SETTING_ICON_PATH_CFG"A01-1_icon_License.png"
-#define IMG_EventsNotifications        SETTING_ICON_PATH_CFG"A01-1_icon_Events_Notifications.png"
 #define IMG_Security                   SETTING_ICON_PATH_CFG"A01-1_icon_Security.png"
 #define IMG_Memory             SETTING_ICON_PATH_CFG"A01-1_icon_Memory.png"
 #define IMG_Reset              SETTING_ICON_PATH_CFG"A01-1_icon_Reset.png"
 #define IMG_AboutPhone                 SETTING_ICON_PATH_CFG"A01-1_icon_About_phone.png"
 #define IMG_Theme                      SETTING_ICON_PATH_CFG"A01-1_icon_USB_Theme.png"
 #define IMG_Accessibility              SETTING_ICON_PATH_CFG"Accessibility.png"
-#define IMG_DrivingMode                SETTING_ICON_PATH_CFG"A01-1_icon_Driving_mode.png"
 
 /* #define IMG_MenuWidgets     SETTING_ICON_PATH_CFG"Menu and widgets"*/
 
 /* applications IMG*/
-#define IMG_Accounts   SETTING_ICON_PATH_CFG"A01-1_icon_Accounts.png"
 #define IMG_Call       "/usr/share/icons/default/small/com.samsung.phone.png"
 #define IMG_Messages "/opt/share/icons/default/small/com.samsung.message.png"
 #define IMG_Email      "/opt/share/icons/default/small/com.samsung.email.png"
 #define IMG_Calendar   "/opt/share/icons/default/small/com.samsung.calendar.png"
 #define IMG_Gallery            "/opt/share/icons/default/small/com.samsung.gallery.png"
 #define IMG_VoiceRecorder      "/opt/share/icons/default/small/com.samsung.voicerecorder.png"
-#define IMG_KeisOverWifi       SETTING_ICON_PATH_CFG"A01-1_icon_Kies_via_Wifi.png"
 #define IMG_NFC                "/opt/ug/res/icons/ug-setting-nfc-efl/com.samsung.nfc-app.png"
 #define IMG_DataUsage          SETTING_ICON_PATH_CFG"com.samsung.traf-control.png"
 
index c69a92b..6078b96 100755 (executable)
@@ -113,7 +113,6 @@ int setting_cfg_create(void)
 
        __create_an_item(KeyStr_FlightMode, IMG_FlightMode, NULL, Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
        __create_an_item(KeyStr_WiFi, IMG_WiFi, "wifi-efl-UG", Cfg_Item_Pos_Level0, Cfg_Item_Resetable);
-       __create_an_item(KeyStr_MobileAP, IMG_MobileAP, "setting-mobile-ap-ug", Cfg_Item_Pos_Level0, Cfg_Item_Resetable);
        __create_an_item(KeyStr_Location, IMG_Location, "setting-location-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable);
        __create_an_item(KeyStr_Network, IMG_Network, "setting-network-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable);
        __create_an_item(KeyStr_Bluetooth, IMG_Bluetooth, "setting-bluetooth-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
@@ -127,30 +126,10 @@ int setting_cfg_create(void)
        __create_an_item(KeyStr_WiFiDirect, IMG_WiFiDirect, "setting-wifidirect-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
 #endif
 
-#if SUPPORT_ALLSHARECAST
-       // Allshare Cast -- Here
-       __create_an_item(KeyStr_AllShareCast, IMG_AllShareCast, "setting-allshare-cast-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
-#endif
-
-#if SUPPORT_AllShare
-       // allshare setting
-       __create_an_item(KeyStr_NearbyDevices, IMG_AllShare, "setting-allshare-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
-#endif
-
-       if ( ! is_slp_binary()) {
-               __create_an_item(KeyStr_KeisOverWifi, IMG_KeisOverWifi, "kies-via-wifi", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
-       }
-
-       if ( ! is_slp_binary()) {
-               __create_an_item(KeyStr_Synchronise, IMG_Synchronise, "setting-synchronise-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
-       }
-
        /* System */
        __create_a_menu(KeyStr_System);
        /* a new group..        */
-#if SUPPORT_EVENTNOTI
-       __create_an_item(KeyStr_EventsNotifications, IMG_EventsNotifications, "setting-phone-efl|viewtype:notification", Cfg_Item_Pos_Level0, Cfg_Item_Resetable);
-#endif
+
        // Wallpaper -- here
 #if SUPPORT_WALLPAPER
        /* kinds of wallpaper version.. */
@@ -192,10 +171,6 @@ int setting_cfg_create(void)
        __create_an_item(KeyStr_LanguageRegion, IMG_DisplayLanguage, "setting-phone-efl|viewtype:language", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
        __create_an_item(KeyStr_KeyboradLanguage, IMG_KeyboradLanguage, "isfsetting-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
 
-#if SUPPORT_VOICEINOUT
-       __create_an_item(KeyStr_VoiceInOut, IMG_VoiceInOut, "setting-voice-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
-#endif
-       __create_an_item(keystr_Drivingmode, IMG_DrivingMode, "setting-drivingmode-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
 #if SUPPORT_STORAGE
        __create_an_item(KeyStr_Storage, IMG_DefaultIcon, "setting-storage-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
 #endif
@@ -216,7 +191,6 @@ int setting_cfg_create(void)
        /* Applications */
        __create_a_menu(KeyStr_Applications);
 
-       __create_an_item(KeyStr_Accounts, IMG_Accounts, "setting-myaccount-efl|mode:account_list", Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
        __create_an_item(KeyStr_Call, IMG_Call, "setting-call-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
        __create_an_item(KeyStr_Messages, IMG_Messages, "msg-setting-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
        __create_an_item(KeyStr_Email, IMG_Email, "email-setting-efl|VIEW_TYPE:main-view", Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
index 7af15e7..5a4555d 100755 (executable)
@@ -73,19 +73,9 @@ static VconfNode g_btable[] = {
 
                {BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE, VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, eBOOL,{0}, export_default},
 
-               {BOOL_SLP_SETTING_TICKER_NOTI_MESSAGES, VCONFKEY_SETAPPL_STATE_TICKER_NOTI_MESSAGES_BOOL, eBOOL,{0}, export_default},
-               {BOOL_SLP_SETTING_TICKER_NOTI_EMAIL, VCONFKEY_SETAPPL_STATE_TICKER_NOTI_EMAIL_BOOL, eBOOL,{0}, export_default},
-               {BOOL_SLP_SETTING_TICKER_NOTI_IM, VCONFKEY_SETAPPL_STATE_TICKER_NOTI_IM_BOOL, eBOOL,{0}, export_default},
-               {BOOL_SLP_SETTING_TICKER_NOTI_FACEBOOK, VCONFKEY_SETAPPL_STATE_TICKER_NOTI_FACEBOOK_BOOL, eBOOL,{0}, export_default},
-               {BOOL_SLP_SETTING_TICKER_NOTI_TWITTER, VCONFKEY_SETAPPL_STATE_TICKER_NOTI_TWITTER_BOOL, eBOOL,{0}, export_default},
 
                {BOOL_SLP_SETTING_TRANSACTION_TRACKING, VCONFKEY_SETAPPL_STATE_TRANSACTION_TRACKING_BOOL, eBOOL,{0}, export_default},
 
-               {BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_MESSASGES, VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_MESSASGES, eBOOL, {0}, export_default},
-               {BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_EMAIL, VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_EMAIL, eBOOL, {0}, export_default},
-               {BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_IM, VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_IM, eBOOL, {0}, export_default},
-               {BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_FACEBOOK, VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_FACEBOOK, eBOOL, {0}, export_default},
-               {BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_TWITTER, VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_TWITTER, eBOOL, {0}, export_default},
 
                {BOOL_SLP_SETTING_EXPIRY_REMINDER, VCONFKEY_SETAPPL_STATE_EXPIRY_REMINDER_BOOL, eBOOL,{0}, export_default},
 
@@ -171,7 +161,6 @@ static VconfNode g_itable[] = {
                {INT_SLP_SETTING_LANG,VCONFKEY_SETAPPL_LANG_INT, eINT, {0}, export_default},
                {INT_SLP_SETTING_BT_STATUS,VCONFKEY_BT_STATUS, eINT, {0}, export_default},
                {INT_SLP_SETTING_WIFI_STATUS,VCONFKEY_WIFI_STATE, eINT, {0}, export_default},
-               {INT_SLP_SETTING_MOBILE_AP_STATUS,VCONFKEY_MOBILE_HOTSPOT_MODE, eINT, {0}, export_default},
                {INT_SLP_SETTING_ROAMING_NETWORK,VCONFKEY_SETAPPL_ROAMING_NETWORK_INT, eINT, {0}, export_default},
                {INT_SLP_SETTING_USB_MODE,VCONFKEY_SETAPPL_USB_MODE_INT, eINT, {0}, export_default},
 #ifdef UNUSED_VCONFKEY
index cc96a96..836a068 100755 (executable)
@@ -268,33 +268,6 @@ char *get_pa_Wi_Fi_on_off_str()
        }
 }
 
-char *get_Mobile_AP_on_off_str()
-{
-       int value = -1, err;
-       int ret =
-           setting_get_int_slp_key(INT_SLP_SETTING_MOBILE_AP_STATUS, &value,
-                                   &err);
-
-       /*  7 means bitwise-operation */
-       /*
-             - 1 : wi-fi
-             - 2 : bluetooth
-             - 4 : USB
-             4, 2, 1 = 7
-       */
-       if (0 != ret || value < 0 || value > 7) {
-               value = 0;
-               setting_set_int_slp_key(INT_SLP_SETTING_MOBILE_AP_STATUS, value,
-                                       &err);
-       }
-
-       if (value != 0) {
-               return setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {                /*  0 */
-               return setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-}
-
 char *get_BT_on_off_str()
 {
        int ret = SETTING_RETURN_FAIL;
index e6478cb..2ddb071 100755 (executable)
@@ -67,39 +67,6 @@ setting_view setting_view_connectivity_usb = {
        .cleanup = setting_connectivity_usb_cleanup,
 };
 
-#if DISABLED_CODE
-static void
-__setting_devoptions_main_exp_cb(void *data, Evas_Object * obj, void *event_info)
-{
-    ret_if(NULL == data || NULL == event_info);
-    SETTING_TRACE_BEGIN;
-       SettingConnectivityUG *ad = (SettingConnectivityUG *) data;
-
-    Elm_Object_Item *parentItem = event_info;   //parent item
-    Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(parentItem);  //parent data
-    Evas_Object *scroller = elm_object_item_widget_get(parentItem);
-
-       // WARNING
-       // setting_create_simple_popup(NULL, ad->win_get, NULL, "NOT IMPLMENTED YET");
-
-       // add each items
-    Evas_Object *rgd;
-    if (data_parentItem == ad->bg_processes /* <- name */) {
-        rgd = elm_radio_add(scroller);
-        elm_radio_value_set(rgd, -1);
-
-        setting_create_Gendial_exp_sub_field(scroller, &(ad->itc_1icon_1text_sub), NULL, NULL, parentItem, SWALLOW_Type_1RADIO, rgd, 0, _(bgprocess_list[0]), NULL);
-        setting_create_Gendial_exp_sub_field(scroller, &(ad->itc_1icon_1text_sub), NULL, NULL, parentItem, SWALLOW_Type_1RADIO, rgd, 1, _(bgprocess_list[1]), NULL);
-        setting_create_Gendial_exp_sub_field(scroller, &(ad->itc_1icon_1text_sub), NULL, NULL, parentItem, SWALLOW_Type_1RADIO, rgd, 2, _(bgprocess_list[2]), NULL);
-        setting_create_Gendial_exp_sub_field(scroller, &(ad->itc_1icon_1text_sub), NULL, NULL, parentItem, SWALLOW_Type_1RADIO, rgd, 3, _(bgprocess_list[3]), NULL);
-        setting_create_Gendial_exp_sub_field(scroller, &(ad->itc_1icon_1text_sub), NULL, NULL, parentItem, SWALLOW_Type_1RADIO, rgd, 4, _(bgprocess_list[4]), NULL);
-        setting_create_Gendial_exp_sub_field(scroller, &(ad->itc_1icon_1text_sub), NULL, NULL, parentItem, SWALLOW_Type_1RADIO, rgd, 5, _(bgprocess_list[5]), NULL);
-
-               setting_update_chk_status(rgd, data_parentItem->int_slp_setting_binded);
-       }
-}
-#endif
-
 /**
  * This function is for adding buttons with a subtitle or a progressbar
  */
@@ -291,87 +258,6 @@ static void setting_connectivity_main_chk_usb_debug_cb(void *data, Evas_Object *
        }
 }
 
-#if DISABLED_CODE
-static void setting_connectivity_main_chk_btn_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;
-    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;
-
-
-       //SETTING_TRACE(" config_engine_get : %s", elm_config_engine_get());
-
-       // DO NOTHING NOW
-       if (opposite)
-       {
-               // ON
-               elm_config_engine_set("opengl_x11");
-               elm_config_save();
-       } else {
-               // OFF
-               elm_config_engine_set("software_x11");
-               elm_config_save();
-       }
-
-
-}
-
-static void setting_connectivity_usb_mouse_up_Gendial_CPU_usage_cb(void* data, Evas_Object* obj, void* event_info)
-{
-       SETTING_TRACE_BEGIN;
-
-       /* error check */
-       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);
-
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       SettingConnectivityUG *ad = (SettingConnectivityUG *) data;
-
-       setting_create_simple_popup(NULL, ad->win_get, NULL, "NOT IMPLMENTED YET");
-
-       SETTING_TRACE_END;
-}
-
-static void setting_connectivity_usb_mouse_up_Gendial_GPU_rendering_cb(void* data, Evas_Object* obj, void* event_info)
-{
-       SETTING_TRACE_BEGIN;
-
-       /* error check */
-       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);
-
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       //SettingConnectivityUG *ad = (SettingConnectivityUG *) data;
-
-       list_item->chk_status = !list_item->chk_status;
-       elm_check_state_set(list_item->eo_check, list_item->chk_status);
-
-       if (list_item->chk_status)
-       {
-               // ON
-               elm_config_engine_set("opengl_x11");
-               elm_config_save();
-       } else {
-               // OFF
-               elm_config_engine_set("software_x11");
-               elm_config_save();
-       }
-
-       SETTING_TRACE_END;
-}
-#endif
-
 /**
  * Do process when clicking on some genlist item
  *
@@ -640,105 +526,6 @@ static int setting_connectivity_usb_create(void *cb)
 
 #endif
 
-#if DISABLED_CODE
-       // [UI] Show CPU Usage
-    ad->cpu_usage =
-        setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon_gen),
-                         setting_connectivity_usb_mouse_up_Gendial_CPU_usage_cb,
-                         ad, SWALLOW_Type_1TOGGLE, NULL,
-                         NULL, 0, "IDS_ST_MBODY_SHOW_CPU_USAGE",
-                         NULL, setting_connectivity_main_chk_btn_cb);
-    if (ad->cpu_usage) {
-        ad->cpu_usage->userdata = ad;
-        //setting_disable_genlist_item(ad->cpu_usage->item);
-    } else {
-        SETTING_TRACE_ERROR("ad->cpu_usage is NULL");
-        return SETTING_RETURN_FAIL;
-    }
-
-    // [UI] help text
-               setting_create_Gendial_field_def(scroller, &(ad->itc_help_style), NULL,
-                   ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
-                   NULL, NULL, 0, _("IDS_ST_BODY_SCREEN_OVERLAY_SHOWING_CURRENT_CPU_USAGE_ABB"), NULL,
-                   NULL);
-               elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
-                                                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       // Get GPU Rendering state
-       //SETTING_TRACE(" config_engine_get : %s", elm_config_engine_get());
-       const char* engine_str = NULL;
-       engine_str = elm_config_engine_get();
-       int gpu_toggle = -1;
-       if (engine_str)
-       {
-               if ( 0 == strcmp(engine_str, "opengl_x11"))
-               {
-                       gpu_toggle = 1;
-                       SETTING_TRACE(">>> opengl_11 selected -- ON ");
-               } else if ( 0 == strcmp(engine_str, "software_x11")) {
-                       gpu_toggle = 0;
-                       SETTING_TRACE(">>> software_11 selected -- OFF ");
-               } else {
-                       engine_str = "software_x11";
-                       gpu_toggle = 0;
-               }
-       } else {
-               // abort();
-       }
-
-       // [UI] Force GPU rendering
-    ad->gpu_render =
-        setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon_gen),
-                         setting_connectivity_usb_mouse_up_Gendial_GPU_rendering_cb,
-                         ad, SWALLOW_Type_1TOGGLE, NULL,
-                         NULL, gpu_toggle, _("IDS_ST_BODY_FORCE_GPU_RENDERING_ABB"),
-                         NULL, setting_connectivity_main_chk_btn_cb);
-    if (ad->gpu_render ) {
-        ad->gpu_render->userdata = ad;
-        //setting_disable_genlist_item(ad->gpu_render->item);
-    } else {
-        SETTING_TRACE_ERROR("ad->gpu_render is NULL");
-        return SETTING_RETURN_FAIL;
-    }
-
-               // [UI] help text
-               setting_create_Gendial_field_def(scroller, &(ad->itc_help_style), NULL,
-                   ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
-                   NULL, NULL, 0, _("IDS_ST_BODY_USE_2D_HARDWARE_ACCELERATION_IN_APPLICATIONS_ABB"), NULL,
-                   NULL);
-               elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
-                                                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       // NEWCODE:
-       setting_enable_expandable_genlist(scroller, ad, __setting_devoptions_main_exp_cb, NULL);
-
-
-    // [UI] expandble list - Automatic answering
-    char *bgproc = get_bg_processes();
-    ad->bg_processes =
-        setting_create_Gendial_exp_parent_field(scroller,
-                &(ad->itc_2text_3_parent),
-                NULL, NULL,
-                SWALLOW_Type_INVALID,
-                "IDS_ST_BODY_LIMIT_BACKGROUND_PROCESSES",
-                bgproc);
-
-       // [UI] Limit background processes
-    if (ad->bg_processes) {
-        ad->bg_processes->userdata = ad;
-        ad->bg_processes->int_slp_setting_binded = INT_SLP_SETTING_DEVOPTION_BGPROCESS;
-
-    } else {
-        SETTING_TRACE_ERROR("ad->bg_processes is NULL");
-        return SETTING_RETURN_FAIL;
-    }
-
-
-       item = elm_genlist_item_append(scroller, &itc_bottom_seperator, NULL, NULL,
-                                                           ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-#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);
index 1cb10d5..b95b710 100755 (executable)
@@ -27,7 +27,7 @@ ADD_LIBRARY(${SETTING_DISPLAY_UG} SHARED
        ##./src/setting-display-backlight.c
        ./src/setting-display-brightness.c
        ./src/setting-display-wallpaper.c
-       ./src/setting-display-smart-screen.c
+       ./src/setting-display-screen-mode.c
        )
 
 TARGET_LINK_LIBRARIES(${SETTING_DISPLAY_UG} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
index 911b4c1..9a32881 100755 (executable)
@@ -86,9 +86,6 @@ struct _SettingDisplayUG {
        Setting_GenGroupItem_Data *data_launch_image;
        Setting_GenGroupItem_Data *data_battery;
 
-       // smart screen
-       Setting_GenGroupItem_Data *data_smart_stay;
-       Setting_GenGroupItem_Data *data_smart_rotation;
        Setting_GenGroupItem_Data *data_auto_adjust_scrn_tone;
 
        // for wallpaper
@@ -124,7 +121,7 @@ struct _SettingDisplayUG {
 extern setting_view setting_view_display_main;
 extern setting_view setting_view_display_brightness;
 extern setting_view setting_view_display_wallpaper;
-extern setting_view setting_view_display_smart_screen;
+extern setting_view setting_view_display_screen_mode;
 
 void setting_display_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
                                  void *priv);
index 8b7bcf8..cfc1f35 100755 (executable)
@@ -175,45 +175,72 @@ static int setting_display_main_create(void *cb)
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       char *curmode = vconf_get_str(VCONFKEY_SETAPPL_SCREENMODE_SELNAME);
-       SETTING_TRACE(">>> CUR SCREEN MODE : %s ", curmode);
+       int value = 0;
+       int ret = 0;
+
+       if (!isEmulBin()) {
+               char *curmode = vconf_get_str(VCONFKEY_SETAPPL_SCREENMODE_SELNAME);
+               SETTING_TRACE(">>> CUR SCREEN MODE : %s ", curmode);
 
-       #if !SUPPOR_SEPARATE_BRIGHTNESS
-       /* BRIGHTNESS */
-       ad->data_br =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_2text_2),
+               int i = 0;
+               for (; i < sizeof(str_in_arr)/sizeof(str_in_arr[0]); i++) {
+                       if (0 == safeStrCmp(str_in_arr[i], curmode)) {
+                               ad->data_screen_mode = setting_create_Gendial_field_def(scroller, &(itc_2text_3),
                                             setting_display_main_mouse_up_Gendial_list_cb,
                                             ad, SWALLOW_Type_INVALID, NULL,
-                                            NULL, 0, "IDS_COM_OPT_BRIGHTNESS",
-                                            get_brightness_mode_str(), NULL);
-       if (ad->data_br) {
-               ad->data_br->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_br is NULL");
-       }
-       #endif
+                                            NULL, 0, Keystr_ScreenMode,
+                                            _(str_out_arr[i]), NULL);
+                               if (ad->data_screen_mode) {
+                                       ad->data_screen_mode->userdata = ad;
+                               } else {
+                                       SETTING_TRACE_ERROR("ad->data_screen_mode is NULL");
+                               }
+                               break;
+                       }
+               }
 
-       int value = 0;
-       int ret = vconf_get_bool(VCONFKEY_SETAPPL_BOOL_AUTO_ADJUST_SCREEN_TONE, &value);
-       ad->data_auto_adjust_scrn_tone =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            setting_display_main_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, value, KeyStr_AdjustScreenTone,
-                                            NULL,
-                                            setting_display_main_auto_adjust_chk_btn_cb);
-       if (ad->data_auto_adjust_scrn_tone) {
-               ad->data_auto_adjust_scrn_tone->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_battery is NULL");
-       }
+               item =
+                   elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
+                                           ELM_GENLIST_ITEM_NONE, NULL, NULL);
+               elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+               #if !SUPPOR_SEPARATE_BRIGHTNESS
+               /* BRIGHTNESS */
+               ad->data_br =
+                   setting_create_Gendial_field_def(scroller, &(ad->itc_2text_2),
+                                                    setting_display_main_mouse_up_Gendial_list_cb,
+                                                    ad, SWALLOW_Type_INVALID, NULL,
+                                                    NULL, 0, "IDS_COM_OPT_BRIGHTNESS",
+                                                    get_brightness_mode_str(), NULL);
+               if (ad->data_br) {
+                       ad->data_br->userdata = ad;
+               } else {
+                       SETTING_TRACE_ERROR("ad->data_br is NULL");
+               }
+               #endif
+
+               ret = vconf_get_bool(VCONFKEY_SETAPPL_BOOL_AUTO_ADJUST_SCREEN_TONE, &value);
+               ad->data_auto_adjust_scrn_tone =
+                   setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
+                                                    setting_display_main_mouse_up_Gendial_list_cb,
+                                                    ad, SWALLOW_Type_1TOGGLE, NULL,
+                                                    NULL, value, KeyStr_AdjustScreenTone,
+                                                    NULL,
+                                                    setting_display_main_auto_adjust_chk_btn_cb);
+               if (ad->data_auto_adjust_scrn_tone) {
+                       ad->data_auto_adjust_scrn_tone->userdata = ad;
+               } else {
+                       SETTING_TRACE_ERROR("ad->data_battery is NULL");
+               }
 
-       setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL,
-                                       ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
-                                       NULL, NULL, 0, KeyStr_AdjustScreenTone_Dsc, NULL, NULL);
+               setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL,
+                                               ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
+                                               NULL, NULL, 0, KeyStr_AdjustScreenTone_Dsc, NULL, NULL);
 
-       elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
-                                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+               elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
+                                                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+       }
+       
        /* BACKLIGHTTIME */
        char* pa_backlight_time = get_pa_backlight_time_str();
        ad->data_back =
@@ -246,19 +273,6 @@ static int setting_display_main_create(void *cb)
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-
-       /* Smart screen */
-       setting_create_Gendial_field_def(scroller, &(itc_1text),
-                                            setting_display_main_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_INVALID, NULL,
-                                            NULL, 0, Keystr_SmartScreen,
-                                            NULL, NULL);
-
-       item =
-           elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
        /* setting_get_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_BRIGHTNESS, &auto_value, &err); */
        value = 0;
        vconf_get_bool(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, &value);
@@ -483,8 +497,8 @@ setting_display_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
                elm_check_state_set(list_item->eo_check, list_item->chk_status);
                vconf_set_bool(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, list_item->chk_status);
        }
-       else if (!safeStrCmp(Keystr_SmartScreen, list_item->keyStr)) {
-               setting_view_change(&setting_view_display_main, &setting_view_display_smart_screen, ad);
+       else if (!safeStrCmp(Keystr_ScreenMode, list_item->keyStr)) {
+               setting_view_change(&setting_view_display_main, &setting_view_display_screen_mode, ad);
        }
 }
 
diff --git a/setting-display/src/setting-display-smart-screen.c b/setting-display/src/setting-display-smart-screen.c
deleted file mode 100755 (executable)
index 05bf2e6..0000000
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <setting-display-smart-screen.h>
-
-#define SETTING_DISPLAY_SMART_STAY             "IDS_ST_MBODY_SMART_STAY"
-#define SETTING_DISPLAY_SMART_STAY_DESC                "Screen stays on as long as you are looking at it"
-
-#define SETTING_DISPLAY_SMART_ROTATION         "IDS_ST_MBODY_SMART_ROTATION"
-#define SETTING_DISPLAY_SMART_ROTATION_DESC    "Screen display direction adjusts to your angle of sights"
-
-#define SETTING_DISPLAY_SMART_STAY_DLG_STR1    "Smart stay detects your eyes with the front camera so that the screen stays on when you are looking at it"
-
-#define SETTING_DISPLAY_SMART_STAY_DLG_STR2    "Smart stay may not work in these situations:<br>"\
-                                               " .When front camera fails to detect face and eyes<br>"\
-                                               " .When the source of light is behind you or when using device in the dark<br>"\
-                                               " .When front camera is used for the application"
-
-#define SETTING_DISPLAY_SMART_ROTATION_DLG_STR1        "Smart rotation disables auto screen rotation by checking the orientation of your face and the device by its front camera."
-
-#define SETTING_DISPLAY_SMART_ROTATION_DLG_STR2        "Smart rotation may not work in these situations:<br>"\
-                                               " .When front camera fails to detect face and eyes<br>"\
-                                               " .When the source of light is behind you or when using device in the dark<br>"\
-                                               " .When front camera is used for the application<br>"\
-                                               "Screen rotation can be slower if Smart rotation enabled"
-#define DO_NOT_ASK_AGAIN "Don't ask again"
-
-static int setting_display_smart_screen_create(void *cb);
-static int setting_display_smart_screen_destroy(void *cb);
-static int setting_display_smart_screen_update(void *cb);
-static int setting_display_smart_screen_cleanup(void *cb);
-
-setting_view setting_view_display_smart_screen = {
-       .create = setting_display_smart_screen_create,
-       .destroy = setting_display_smart_screen_destroy,
-       .update = setting_display_smart_screen_update,
-       .cleanup = setting_display_smart_screen_cleanup,
-};
-
-static void
-__smart_stay_on_resp_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(NULL == data, "NULL == data");
-       int response_type = btn_type(obj);
-       SettingDisplayUG *ad = (SettingDisplayUG *) data;
-       if (POPUP_RESPONSE_OK == response_type) {       //need set vconf
-               ret_if (!ad->data_smart_stay);
-               int err = vconf_set_int(VCONFKEY_PM_SMARTSTAY_STATUS, ad->data_smart_stay->chk_status);
-               if (0 != err) { //if set failed, need rollback
-                       SETTING_TRACE_ERROR("Set vconf Failed");
-                       if (ad->data_smart_stay) {
-                               ad->data_smart_stay->chk_status = !ad->data_smart_stay->chk_status;
-                               elm_check_state_set(ad->data_smart_stay->eo_check, ad->data_smart_stay->chk_status);
-                       }
-                       return;
-               }
-
-               if (ad->popup_chk && elm_check_state_get(ad->popup_chk)) {
-                       vconf_set_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMARTSTAY_STATUS_REMINDER, FALSE);
-               }
-
-       } else if (POPUP_RESPONSE_CANCEL == response_type) {    //need rollback
-               if (ad->data_smart_stay) {
-                       ad->data_smart_stay->chk_status = !ad->data_smart_stay->chk_status;
-                       elm_check_state_set(ad->data_smart_stay->eo_check, ad->data_smart_stay->chk_status);
-               }
-       }
-
-       evas_object_del(ad->popup);
-       ad->popup = NULL;
-       ad->popup_chk = NULL;
-}
-
-static void
-__smart_rotate_on_resp_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(NULL == data, "NULL == data");
-       int response_type = btn_type(obj);
-       SettingDisplayUG *ad = (SettingDisplayUG *) data;
-       if (POPUP_RESPONSE_OK == response_type) {       //need set vconf
-               ret_if (!ad->data_smart_rotation);
-               int err = vconf_set_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMART_ROTATION, ad->data_smart_rotation->chk_status);
-               if (0 != err) { //if set failed, need rollback
-                       SETTING_TRACE_ERROR("Set vconf Failed");
-                       if (ad->data_smart_rotation) {
-                               ad->data_smart_rotation->chk_status = !ad->data_smart_rotation->chk_status;
-                               elm_check_state_set(ad->data_smart_rotation->eo_check, ad->data_smart_rotation->chk_status);
-                       }
-                       return;
-               }
-
-               if (ad->popup_chk && elm_check_state_get(ad->popup_chk)) {
-                       vconf_set_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMARTROTATE_STATUS_REMINDER, FALSE);
-               }
-
-       } else if (POPUP_RESPONSE_CANCEL == response_type) {    //need rollback
-               if (ad->data_smart_rotation) {
-                       ad->data_smart_rotation->chk_status = !ad->data_smart_rotation->chk_status;
-                       elm_check_state_set(ad->data_smart_rotation->eo_check, ad->data_smart_rotation->chk_status);
-               }
-       }
-
-       evas_object_del(ad->popup);
-       ad->popup = NULL;
-       ad->popup_chk = NULL;
-}
-
-
-static void __handle_via_check_status(void *data)
-{
-       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
-       retm_if(!list_item || !list_item->userdata, "list_item == NULL || list_item->userdata");
-       SettingDisplayUG *ad = list_item->userdata;
-
-       SETTING_TRACE("list_item->chk_status = %d", list_item->chk_status);
-       if (!safeStrCmp(SETTING_DISPLAY_SMART_STAY, list_item->keyStr)) {
-               int reminder_flag = TRUE;
-               int ret = vconf_get_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMARTSTAY_STATUS_REMINDER, &reminder_flag);
-               if (0 != ret) {
-                       SETTING_TRACE_ERROR("Failed to get vconf value");
-               }
-               SETTING_TRACE("reminder_flag:%d", reminder_flag);
-               if (list_item->chk_status && reminder_flag) {
-                       ad->popup =
-                           setting_create_popup_with_image_check(ad, ad->win_get,
-                                                           _(SETTING_DISPLAY_SMART_STAY),
-                                                           _(SETTING_DISPLAY_SMART_STAY_DLG_STR1),
-                                                           _(SETTING_DISPLAY_SMART_STAY_DLG_STR2),
-                                                           SETTING_ICON_PATH_CFG"SmartScreen.png",
-                                                           _(DO_NOT_ASK_AGAIN),
-                                                           &(ad->popup_chk),
-                                                           __smart_stay_on_resp_cb,
-                                                           0,
-                                                           2, _("IDS_COM_SK_OK"),
-                                                           _("IDS_COM_SK_CANCEL"));
-                       return;
-               }
-               ret =
-                   vconf_set_int(VCONFKEY_PM_SMARTSTAY_STATUS, list_item->chk_status);
-               if (0 != ret) { /* rollback */
-                       SETTING_TRACE_ERROR("Set vconf Failed");
-                       list_item->chk_status = !list_item->chk_status;
-                       elm_check_state_set(list_item->eo_check,
-                                           list_item->chk_status);
-                       return;
-               }
-
-       } else if(!safeStrCmp(SETTING_DISPLAY_SMART_ROTATION, list_item->keyStr)) {
-               int reminder_flag = TRUE;
-               int ret = vconf_get_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMARTROTATE_STATUS_REMINDER, &reminder_flag);
-               if (0 != ret) {
-                       SETTING_TRACE_ERROR("Failed to get vconf value");
-               }
-               SETTING_TRACE("reminder_flag:%d", reminder_flag);
-               if (list_item->chk_status && reminder_flag) {
-                       ad->popup =
-                           setting_create_popup_with_image_check(ad, ad->win_get,
-                                                           _(SETTING_DISPLAY_SMART_ROTATION),
-                                                           _(SETTING_DISPLAY_SMART_ROTATION_DLG_STR1),
-                                                           _(SETTING_DISPLAY_SMART_ROTATION_DLG_STR2),
-                                                           SETTING_ICON_PATH_CFG"SmartScreen.png",
-                                                           _(DO_NOT_ASK_AGAIN),
-                                                           &(ad->popup_chk),
-                                                           __smart_rotate_on_resp_cb,
-                                                           0,
-                                                           2, _("IDS_COM_SK_OK"),
-                                                           _("IDS_COM_SK_CANCEL"));
-                       return;
-               }
-               ret =
-                   vconf_set_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMART_ROTATION, list_item->chk_status);
-               if (0 != ret) { /* rollback */
-                       SETTING_TRACE_ERROR("Set vconf Failed");
-                       list_item->chk_status = !list_item->chk_status;
-                       elm_check_state_set(list_item->eo_check,
-                                           list_item->chk_status);
-                       return;
-               }
-
-       }
-}
-
-static void __setting_display_smart_screen_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
-                                             void *event_info)
-{
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       setting_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);
-       int old_status = elm_check_state_get(list_item->eo_check);
-       list_item->chk_status = !old_status;
-       elm_check_state_set(list_item->eo_check, list_item->chk_status);
-       __handle_via_check_status(list_item);
-}
-
-static void __setting_display_smart_screen_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
-       list_item->chk_status = elm_check_state_get(obj);       /*  for genlist update status */
-       __handle_via_check_status(list_item);
-}
-
-/* ***************************************************
- *
- *basic func
- *
- ***************************************************/
-static int setting_display_smart_screen_create(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       SettingDisplayUG *ad = (SettingDisplayUG *) cb;
-
-       Evas_Object *scroller = NULL;
-       setting_push_layout_navi_bar_genlist(ad->win_main_layout,
-                                          ad->win_get,
-                                          _(Keystr_SmartScreen), _("IDS_COM_BODY_BACK"),
-                                          NULL,
-                                          __setting_display_smart_screen_click_softkey_back_cb,
-                                          NULL, ad, &scroller,
-                                          ad->navi_bar);
-
-       Elm_Object_Item *item = NULL;
-       item = elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       int ret = 0;
-       int value = 0;
-       ret = vconf_get_int(VCONFKEY_PM_SMARTSTAY_STATUS, &value);
-       SETTING_TRACE("value = %d", value);
-       setting_retvm_if(ret != 0, SETTING_RETURN_FAIL, "fail to get vconf");
-
-       ad->data_smart_stay = setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            __setting_display_smart_screen_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, value,
-                                            SETTING_DISPLAY_SMART_STAY, NULL,
-                                            __setting_display_smart_screen_chk_btn_cb);
-       if (ad->data_smart_stay) {
-               ad->data_smart_stay->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_launch_image is NULL");
-       }
-
-       setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL,
-                                       ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
-                                       NULL, NULL, 0, SETTING_DISPLAY_SMART_STAY_DESC, NULL, NULL);
-       elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
-                                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       ret = vconf_get_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMART_ROTATION, &value);
-       SETTING_TRACE("value = %d", value);
-       setting_retvm_if(ret != 0, SETTING_RETURN_FAIL, "fail to get vconf");
-
-       ad->data_smart_rotation = setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            __setting_display_smart_screen_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, value,
-                                            SETTING_DISPLAY_SMART_ROTATION, NULL,
-                                            __setting_display_smart_screen_chk_btn_cb);
-       if (ad->data_smart_rotation) {
-               ad->data_smart_rotation->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_launch_image is NULL");
-       }
-
-       setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL,
-                                       ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
-                                       NULL, NULL, 0, SETTING_DISPLAY_SMART_ROTATION_DESC, NULL, NULL);
-       elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_bottom_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
-                                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       setting_view_display_smart_screen.is_create = 1;
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_display_smart_screen_destroy(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       SettingDisplayUG *ad = (SettingDisplayUG *) cb;
-
-       elm_naviframe_item_pop(ad->navi_bar);
-       setting_view_display_smart_screen.is_create = 0;
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_display_smart_screen_update(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_display_smart_screen_cleanup(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingDisplayUG *ad = (SettingDisplayUG *) cb;
-
-       setting_display_smart_screen_destroy(ad);
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-/* ***************************************************
- *
- *general func
- *
- ***************************************************/
-
-static void __setting_display_smart_screen_click_softkey_back_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       setting_retm_if(data == NULL,
-                       "[Setting > Display] Data parameter is NULL");
-
-       SettingDisplayUG *ad = (SettingDisplayUG *) data;
-
-       setting_view_change(&setting_view_display_smart_screen, &setting_view_display_main, ad);
-}
index e8fbcc2..b2e4f26 100755 (executable)
@@ -59,9 +59,9 @@ setting_view *__get_display_view_to_load(service_h service)
                return &setting_view_display_wallpaper;
        } else {
                setting_view_node_table_register(&setting_view_display_main, NULL);
-               setting_view_node_table_register(&setting_view_display_brightness,
+               setting_view_node_table_register(&setting_view_display_screen_mode,
                                                 &setting_view_display_main);
-               setting_view_node_table_register(&setting_view_display_smart_screen,
+               setting_view_node_table_register(&setting_view_display_brightness,
                                                 &setting_view_display_main);
                return &setting_view_display_main;
        }
@@ -177,7 +177,7 @@ static void setting_display_ug_on_destroy(ui_gadget_h ug, service_h service,
        if (&setting_view_display_main == displayUG->view_to_load) {
                setting_view_destroy(&setting_view_display_brightness,
                                     displayUG);
-               setting_view_destroy(&setting_view_display_smart_screen, displayUG);
+               setting_view_destroy(&setting_view_display_screen_mode, displayUG);
                setting_view_destroy(&setting_view_display_main, displayUG);
        } else if (&setting_view_display_wallpaper == displayUG->view_to_load) {
                setting_view_destroy(&setting_view_display_wallpaper,
index 10ab8bf..0922791 100755 (executable)
@@ -25,11 +25,6 @@ ADD_DEFINITIONS("-DSLP_DEBUG")
 ADD_LIBRARY(${SETTING_PHONE_UG} SHARED
        ./src/setting-phone.c
        ./src/setting-phone-language-region.c
-       ./src/setting-phone-ticker-notification.c
-       ./src/setting-phone-ticker-notification-details.c
-#      ./src/setting-phone-license-main.c
-#      ./src/setting-phone-license-divx-main.c
-#      ./src/setting-phone-license-divx-mode.c
        ./src/setting-phone-display-language.c
        ./src/setting-phone-region-format.c
        )
diff --git a/setting-phone/include/setting-phone-license-divx-main.h b/setting-phone/include/setting-phone-license-divx-main.h
deleted file mode 100755 (executable)
index ddc182b..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#ifndef __SETTING_PHONE_LICENSE_DIVX_MAIN_H__
-#define __SETTING_PHONE_LICENSE_DIVX_MAIN_H__
-
-#include <setting-phone-license-main.h>
-
-static void setting_phone_license_divx_main_click_softkey_back_cb(void *data,
-                                                                 Evas_Object *
-                                                                 obj, void
-                                                                 *event_info);
-static void setting_phone_license_divx_main_mouse_up_Gendial_list_cb(void *data,
-                                                                    Evas_Object
-                                                                *obj, void
-                                                                    *event_info);
-static Evas_Object *setting_phone_license_divx_main_create_dereg_popup(void
-                                                                      *data);
-static void setting_phone_license_divx_main_click_popup_dereg_cb(void *data);
-static void setting_phone_license_divx_main_click_popup_cancel_cb(void *data);
-
-#endif                         /* __SETTING_PHONE_LICENSE_DIVX_MAIN_H__ */
diff --git a/setting-phone/include/setting-phone-license-divx-mode.h b/setting-phone/include/setting-phone-license-divx-mode.h
deleted file mode 100755 (executable)
index cb26bd7..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#ifndef __SETTING_PHONE_LICENSE_DIVX_MODE_H__
-#define __SETTING_PHONE_LICENSE_DIVX_MODE_H__
-
-#include <setting-phone-license-main.h>
-
-static void setting_phone_license_divx_mode_click_softkey_back_cb(void *data,
-                                                                 Evas_Object *
-                                                                 obj, void
-                                                                 *event_info);
-
-#endif                         /* __SETTING_PHONE_LICENSE_DIVX_MODE_H__ */
diff --git a/setting-phone/include/setting-phone-license-main.h b/setting-phone/include/setting-phone-license-main.h
deleted file mode 100755 (executable)
index 3f0fc15..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#ifndef __SETTING_PHONE_LICENSE_MAIN_H__
-#define __SETTING_PHONE_LICENSE_MAIN_H__
-
-#include <setting-phone.h>
-#include <drm_client.h>
-#include <drm_client_types.h>
-#include <drm_trusted_client.h>
-#include <drm_trusted_client_types.h>
-
-#define SETTING_DIVX_MODE_REG 0
-#define SETTING_DIVX_MODE_DEREG 1
-
-void setting_phone_license_main_chk_btn_cb(void *data, Evas_Object *obj,
-                                          void *event_info);
-void setting_phone_license_main_mouse_up_Gendial_list_cb(void *data,
-                                                        Evas_Object *obj,
-                                                        void *event_info);
-void setting_phone_license_main_click_softkey_cancel(void *data,
-                                                    Evas_Object *obj,
-                                                    void *event_info);
-void setting_phone_license_main_popup_resp_cb(void *data, Evas_Object *obj,
-                                             void *event_info);
-void setting_phone_license_clear_license_resp_cb(void *data, Evas_Object *obj,
-                                                void *event_info);
-
-#endif                         /* __SETTING_PHONE_LICENSE_MAIN_H__ */
diff --git a/setting-phone/include/setting-phone-ticker-notification-details.h b/setting-phone/include/setting-phone-ticker-notification-details.h
deleted file mode 100644 (file)
index 2b4265a..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#ifndef __SETTING_PHONE_TICKER_NOTIFICATION_DETAILS_H__
-#define __SETTING_PHONE_TICKER_NOTIFICATION_DETAILS_H__
-
-#include <setting-phone.h>
-
-#define APP_3RD_LIST 0
-
-static void setting_phone_noti_details_chk_btn_cb(void *data,
-                                                  Evas_Object *obj,
-                                                  void *event_info);
-static void setting_phone_noti_details_mouse_up_Gendial_list_cb(void *data,
-                                                       Evas_Object *obj,
-                                                       void *event_info);
-static void setting_phone_noti_details_click_softkey_back_cb(void *data,
-                                                    Evas_Object *obj,
-                                                    void *event_info);
-
-#endif                         /* __SETTING_PHONE_TICKER_NOTIFICATION_DETAILS_H__ */
diff --git a/setting-phone/include/setting-phone-ticker-notification.h b/setting-phone/include/setting-phone-ticker-notification.h
deleted file mode 100755 (executable)
index 19dbe31..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#ifndef __SETTING_PHONE_TICKER_NOTIFICATION_H__
-#define __SETTING_PHONE_TICKER_NOTIFICATION_H__
-
-#include <setting-phone.h>
-
-#define APP_3RD_LIST 1
-
-static void setting_phone_noti_mouse_up_chk_btn_cb(void *data,
-                                                  Evas_Object *obj,
-                                                  void *event_info);
-static void setting_phone_noti_mouse_up_Gendial_list_cb(void *data,
-                                                       Evas_Object *obj,
-                                                       void *event_info);
-static void setting_phone_noti_click_softkey_back_cb(void *data,
-                                                    Evas_Object *obj,
-                                                    void *event_info);
-
-#endif                         /* __SETTING_PHONE_TICKER_NOTIFICATION_H__ */
index ca8eb5c..1e2ddee 100755 (executable)
@@ -59,7 +59,6 @@
 
 #define REGION_ITEM_MAX 300
 
-#define SETTING_PHONE_FONT_CHANGED_POPUP_DESC "Font has been changed."
 #define ASK_DEREG_PHONE "<linesize=44>Your phone is<br>already registered.<br> Are you sure you<br>wish to deregister?"
 #define REGISTRATION_GET_FAILED "Failed to get registration code"
 #define REGISTRATION_INDICATOT "<br><br><br><br>Your device<br>registration code:<br><br>"
@@ -97,39 +96,10 @@ struct _SettingPhoneUG {
        int intial_shaking_value;
 
        Evas_Object *ly_language;
-       Evas_Object *ly_ticker;
-       Evas_Object *ly_license;
-
-
-       // [UI] notification details
-       Setting_GenGroupItem_Data *data_details_notification;
-       Setting_GenGroupItem_Data *data_details_display_content;
-       Setting_GenGroupItem_Data *data_details_badge;
-
-       char* sel_string;
-
-       // [UI] notification
-       Setting_GenGroupItem_Data *data_n_msg;
-       Setting_GenGroupItem_Data *data_n_email;
-       Setting_GenGroupItem_Data *data_n_im;
-       Setting_GenGroupItem_Data *data_n_fb;
-       Setting_GenGroupItem_Data *data_n_twt;
 
        // [UI] license
        Evas_Object *chk_lang;
        int prev_lang;          /** prev is used for special lang. */
-       Setting_GenGroupItem_Data *data_tracking;
-       Setting_GenGroupItem_Data *data_expiry;
-       Setting_GenGroupItem_Data *data_roaming_nw;
-
-       /* divx.... */
-       Setting_GenGroupItem_Data *data_reg;
-       Setting_GenGroupItem_Data *data_dereg;
-       Evas_Object *pop_dereg;
-       int mode;               /* 0: reg, 1: dereg */
-
-       Evas_Object *chk_tracking;
-       Evas_Object *chk_expiry;
 
        //bundle *bundle_data;
        service_h bundle_data;
@@ -174,11 +144,6 @@ struct _SettingPhoneUG {
 
 /* extern setting_view setting_view_phone_main; */
 extern setting_view setting_view_phone_language_region;
-extern setting_view setting_view_phone_ticker_notification;
-extern setting_view setting_view_phone_ticker_notification_details;
-extern setting_view setting_view_phone_license_main;
-extern setting_view setting_view_phone_license_divx_main;
-extern setting_view setting_view_phone_license_divx_mode;
 extern setting_view setting_view_phone_display_language;
 extern setting_view setting_view_phone_region_format;
 
diff --git a/setting-phone/src/setting-phone-license-divx-main.c b/setting-phone/src/setting-phone-license-divx-main.c
deleted file mode 100755 (executable)
index 97dd726..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <setting-phone-license-divx-main.h>
-
-static int setting_phone_license_divx_main_create(void *cb);
-static int setting_phone_license_divx_main_destroy(void *cb);
-static int setting_phone_license_divx_main_update(void *cb);
-static int setting_phone_license_divx_main_cleanup(void *cb);
-
-setting_view setting_view_phone_license_divx_main = {
-       .create = setting_phone_license_divx_main_create,
-       .destroy = setting_phone_license_divx_main_destroy,
-       .update = setting_phone_license_divx_main_update,
-       .cleanup = setting_phone_license_divx_main_cleanup,
-};
-
-/* ***************************************************
- *
- *basic func
- *
- ***************************************************/
-
-static int setting_phone_license_divx_main_create(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       Evas_Object *scroller;
-       /* scroller is a genlist */
-       setting_push_layout_navi_bar_genlist(ad->win_main_layout, ad->win_get,
-                                            _("IDS_ST_HEADER_DIVX_VOD"),
-                                            dgettext("sys_string",
-                                                     "IDS_COM_BODY_BACK"),
-                                            NULL,
-                                            setting_phone_license_divx_main_click_softkey_back_cb,
-                                            NULL, ad, &scroller, ad->navi_bar);
-
-       Elm_Object_Item *item = NULL;;
-
-       item =
-           elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       ad->data_reg =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text),
-                                            setting_phone_license_divx_main_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_INVALID, NULL,
-                                            NULL, 0,
-                                            "IDS_ST_MBODY_REGISTER",
-                                            NULL, NULL);
-
-       ad->data_dereg =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text),
-                                            setting_phone_license_divx_main_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_INVALID, NULL,
-                                            NULL, 0,
-                                            "IDS_ST_MBODY_DEREGISTER",
-                                            NULL, NULL);
-       int result;
-       drm_bool_type_e is_first = 0;
-       result = drm_is_action_allowed(DRM_IS_DEVICE_ACTIVATED, NULL, &is_first);
-       SETTING_TRACE_DEBUG("%s*** drm status - result=%d, is_first=%d ***%s",
-                           SETTING_FONT_BGREEN, (int)result, is_first,
-                           SETTING_FONT_BLACK);
-       if (!result) {
-               if (is_first) { /* disable de-reg */
-                       if (ad->data_dereg) {
-                               elm_object_item_disabled_set(ad->data_dereg->item,
-                                                             EINA_TRUE);
-                       } else {
-                               SETTING_TRACE_ERROR("ad->data_dereg is NULL");
-                       }
-               }
-       } else {                /* disable reg */
-               if (ad->data_reg) {
-                       elm_object_item_disabled_set(ad->data_reg->item,
-                                                     EINA_TRUE);
-               } else {
-                       SETTING_TRACE_ERROR("ad->data_reg is NULL");
-               }
-       }
-
-       setting_view_phone_license_divx_main.is_create = 1;
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_divx_main_destroy(void *cb)
-{
-
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       elm_naviframe_item_pop(ad->navi_bar);
-       setting_view_phone_license_divx_main.is_create = 0;
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_divx_main_update(void *cb)
-{
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       if(ad->mode == SETTING_DIVX_MODE_REG)
-       {
-               setting_disable_genlist_item(ad->data_reg->item);
-               setting_enable_genlist_item(ad->data_dereg->item);
-       }
-       else if(ad->mode == SETTING_DIVX_MODE_DEREG)
-       {
-               setting_enable_genlist_item(ad->data_reg->item);
-               setting_disable_genlist_item(ad->data_dereg->item);
-       }
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_divx_main_cleanup(void *cb)
-{
-       return setting_phone_license_divx_main_destroy(cb);
-}
-
-/* ***************************************************
- *
- *general func
- *
- ***************************************************/
-
-static void setting_phone_license_ask_deregistration_resp_cb(void *data,
-                                                            Evas_Object *obj,
-                                                            void *event_info)
-{
-       int response_type = btn_type(obj);
-       if (POPUP_RESPONSE_OK == response_type) {
-               setting_phone_license_divx_main_click_popup_dereg_cb(data);
-       } else if (POPUP_RESPONSE_CANCEL == response_type) {
-               setting_phone_license_divx_main_click_popup_cancel_cb(data);
-       }
-}
-
-static Evas_Object *setting_phone_license_divx_main_create_dereg_popup(void
-                                                                      *data)
-{
-       /* error check */
-       retvm_if(data == NULL, NULL,
-                "[Setting > About] Data parameter is NULL");
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       Evas_Object *notify;
-       notify =
-           setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                _(ASK_DEREG_PHONE),
-                                setting_phone_license_ask_deregistration_resp_cb,
-                                0, 2, _("IDS_COM_SK_OK"),_("IDS_COM_SK_CANCEL"));
-
-       return notify;
-}
-
-/* ***************************************************
- *
- *call back func
- *
- ***************************************************/
-
-static void
-setting_phone_license_divx_main_click_softkey_back_cb(void *data,
-                                                     Evas_Object *obj,
-                                                     void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       setting_view_change(&setting_view_phone_license_divx_main, &setting_view_phone_license_main, ad);
-}
-
-static void
-setting_phone_license_divx_main_mouse_up_Gendial_list_cb(void *data,
-                                                        Evas_Object *obj,
-                                                        void *event_info)
-{
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter 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);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
-       if (!safeStrCmp("IDS_ST_MBODY_REGISTER", list_item->keyStr)) {
-               ad->mode = SETTING_DIVX_MODE_REG;
-               setting_view_change(&setting_view_phone_license_divx_main,
-                                   &setting_view_phone_license_divx_mode, ad);
-       } else
-           if (!safeStrCmp
-               ("IDS_ST_MBODY_DEREGISTER", list_item->keyStr)) {
-               ad->pop_dereg =
-                   setting_phone_license_divx_main_create_dereg_popup(ad);
-       }
-}
-
-static void setting_phone_license_divx_main_click_popup_dereg_cb(void *data)
-{
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       if (ad->pop_dereg) {
-               evas_object_del(ad->pop_dereg);
-               ad->pop_dereg = NULL;
-       }
-
-       ad->mode = SETTING_DIVX_MODE_DEREG;
-       setting_view_change(&setting_view_phone_license_divx_main,
-                           &setting_view_phone_license_divx_mode, ad);
-}
-
-static void setting_phone_license_divx_main_click_popup_cancel_cb(void *data)
-{
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       if (ad->pop_dereg) {
-               evas_object_del(ad->pop_dereg);
-               ad->pop_dereg = NULL;
-       }
-}
diff --git a/setting-phone/src/setting-phone-license-divx-mode.c b/setting-phone/src/setting-phone-license-divx-mode.c
deleted file mode 100755 (executable)
index 9737712..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <setting-phone-license-divx-mode.h>
-#include <appsvc.h>
-
-#define SUPPORT_URL_OPEN       1
-#define DIVX_URL "http://vod.divx.com"
-#define SET_DVIX_REGISTRSTION_CODE_LEN 10
-#define SET_DVIX_DEREGISTRSTION_CODE_LEN 8
-
-static int setting_phone_license_divx_mode_create(void *cb);
-static int setting_phone_license_divx_mode_destroy(void *cb);
-static int setting_phone_license_divx_mode_update(void *cb);
-static int setting_phone_license_divx_mode_cleanup(void *cb);
-
-setting_view setting_view_phone_license_divx_mode = {
-       .create = setting_phone_license_divx_mode_create,
-       .destroy = setting_phone_license_divx_mode_destroy,
-       .update = setting_phone_license_divx_mode_update,
-       .cleanup = setting_phone_license_divx_mode_cleanup,
-};
-
-/* ***************************************************
- *
- *basic func
- *
- ***************************************************/
-
-static char *setting_phone_license_divx_mode_get_title_str(void *cb)
-{
-       retv_if(cb == NULL, NULL);
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-       if (ad->mode == SETTING_DIVX_MODE_REG) {
-               return _("IDS_ST_BODY_DIVX_REGISTRATION");
-       } else {
-               return _("IDS_ST_BODY_DIVX_DEREGISTRATION");
-       }
-}
-
-#if SUPPORT_URL_OPEN
-static void __url_mouse_down_cb(void *data, Evas *e, Evas_Object *eo, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       ret_if(!event_info || !data);
-
-       service_h svc;
-       if(service_create(&svc))
-               return;
-
-       service_set_operation(svc, APPSVC_OPERATION_VIEW);
-       service_set_uri(svc, DIVX_URL);
-       service_send_launch_request(svc, NULL, NULL);
-       if (service_destroy(svc)) {
-               SETTING_TRACE_ERROR("bundle_free()");
-       }
-       //elm_win_lower(ad->win_main_layout);
-       return;
-}
-#endif
-
-static int setting_phone_license_divx_mode_create(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-       char str[MAX_DISPLAY_NAME_LEN_ON_UI] = { 0, };
-       const char *desc = NULL;
-       const char *url = NULL;
-
-       if (ad->mode == SETTING_DIVX_MODE_REG) {
-               int result;
-
-               drm_code_info_s info;
-               result = drm_get_data(DRM_DATA_TYPE_DIVX_REGISTRATION_CODE, NULL, &info);
-
-               SETTING_TRACE_DEBUG
-                   ("%s*** regiString=%s, codeLength=%d, result=%d ***%s",
-                    SETTING_FONT_BGREEN, info.code, info.code_len, (int)result,
-                    SETTING_FONT_BLACK);
-
-               if (result != 0 || '\0' == info.code[0]) {
-                       SETTING_TRACE_ERROR("%s*** [ERR] DRM_FALSE ***%s",
-                                           SETTING_FONT_RED,
-                                           SETTING_FONT_BLACK);
-                       ad->mode = SETTING_DIVX_MODE_DEREG;
-                       setting_create_popup_without_btn(ad, ad->win_get,
-                                            NULL, _(REGISTRATION_GET_FAILED),
-                                            NULL, POPUP_INTERVAL, FALSE, FALSE);
-                       snprintf(info.code, sizeof(info.code), "Unavailable");
-               }
-               safeStrNCat(str, _(REGISTRATION_INDICATOT), MAX_DISPLAY_NAME_LEN_ON_UI);
-               safeStrNCat(str, info.code, MAX_DISPLAY_NAME_LEN_ON_UI);
-               safeStrNCat(str, _(REGISTRATION_AT), MAX_DISPLAY_NAME_LEN_ON_UI);
-       } else {
-               int result;
-
-               drm_code_info_s info;
-               result = drm_get_data(DRM_DATA_TYPE_DIVX_DEREGISTRATION_CODE, NULL, &info);
-
-               SETTING_TRACE_DEBUG
-                   ("%s*** deregiString=%s, codeLength=%d, result=%d ***%s",
-                    SETTING_FONT_BGREEN, info.code, info.code_len, result,
-                    SETTING_FONT_BLACK);
-
-               if (result != 0 || '\0' == info.code[0]) {
-                       SETTING_TRACE_ERROR("%s*** [ERR] DRM_FALSE ***%s",
-                                           SETTING_FONT_RED,
-                                           SETTING_FONT_BLACK);
-                       ad->mode = SETTING_DIVX_MODE_REG;
-                       setting_create_popup_without_btn(ad, ad->win_get,
-                                            NULL, _("IDS_ST_BODY_DE_REGISTRATION_CODE_NOT_FOUND"),
-                                            NULL, POPUP_INTERVAL, FALSE, FALSE);
-                       snprintf(info.code, sizeof(info.code), "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
-               }
-               safeStrNCat(str, _(DEREGISTRATION_INDICATOT), MAX_DISPLAY_NAME_LEN_ON_UI);
-               safeStrNCat(str, info.code, MAX_DISPLAY_NAME_LEN_ON_UI);
-               safeStrNCat(str, _(EREGISTRATION_AT), MAX_DISPLAY_NAME_LEN_ON_UI);
-       }
-
-       Evas_Object *scroller;
-
-       setting_push_layout_navi_bar_scroller(ad->win_main_layout,
-                                             setting_phone_license_divx_mode_get_title_str
-                                             (ad), _("IDS_COM_BODY_BACK"),
-                                             NULL,
-                                             setting_phone_license_divx_mode_click_softkey_back_cb,
-                                             NULL, ad, &scroller,
-                                             ad->navi_bar);
-       elm_genlist_mode_set(scroller, ELM_LIST_COMPRESS);
-
-
-       url = setting_customize_text("<underline=on><underline_color=#FF0000>"DIVX_URL"</underline_color></underline>", 0, "#FF0000", "center");
-       Evas_Object *outer_box = setting_create_client_bx(ad->win_main_layout);
-       #if SUPPORT_URL_OPEN
-       SETTING_TRACE_DEBUG("str : %s", str);
-       desc = setting_customize_text(str, 0, NULL, "center");
-
-       Evas_Object *ly_desc = setting_create_textbox(ad->win_main_layout, desc);
-       setting_disable_evas_object(ly_desc);
-       elm_box_pack_end(outer_box, ly_desc);
-
-       Evas_Object *ly_url = setting_create_textbox(ad->win_main_layout, url);
-       evas_object_event_callback_add(ly_url, EVAS_CALLBACK_MOUSE_DOWN, __url_mouse_down_cb, ad);
-       elm_box_pack_end(outer_box, ly_url);
-       #else
-       char tmp_str[MAX_COMMON_BUFFER_LEN] = { 0, };
-       snprintf(tmp_str, sizeof(tmp_str), "%s<br>%s", str, url);
-       desc = setting_customize_text(tmp_str, 0, NULL, "center");
-       Evas_Object *ly_desc = setting_create_textbox(ad->win_main_layout, desc);
-       setting_disable_evas_object(ly_desc);
-       elm_box_pack_end(outer_box, ly_desc);
-       #endif
-
-       elm_object_content_set(scroller, outer_box);
-
-       setting_view_phone_license_divx_mode.is_create = 1;
-       FREE(desc);
-       FREE(url);
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_divx_mode_destroy(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       elm_naviframe_item_pop(ad->navi_bar);
-       setting_view_phone_license_divx_mode.is_create = 0;
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_divx_mode_update(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_divx_mode_cleanup(void *cb)
-{
-       return setting_phone_license_divx_mode_destroy(cb);
-}
-
-/* ***************************************************
- *
- *general func
- *
- ***************************************************/
-
-/* ***************************************************
- *
- *call back func
- *
- ***************************************************/
-
-static void
-setting_phone_license_divx_mode_click_softkey_back_cb(void *data,
-                                                     Evas_Object *obj,
-                                                     void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       setting_view_change(&setting_view_phone_license_divx_mode,
-                           &setting_view_phone_license_divx_main, ad);
-}
diff --git a/setting-phone/src/setting-phone-license-main.c b/setting-phone/src/setting-phone-license-main.c
deleted file mode 100755 (executable)
index 1476939..0000000
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <setting-phone-license-main.h>
-#define SUPPORT_TRANSFER_TRACKING 1
-#define SUPPORT_CLEAR_LICENSE 1
-#define SUPPORT_ROAMING_NETWORK 1
-#define TEXT_CLEAR_LICENSE   "IDS_ST_BODY_REMOVE_LICENCE"
-
-static int setting_phone_license_main_create(void *cb);
-static int setting_phone_license_main_destroy(void *cb);
-static int setting_phone_license_main_update(void *cb);
-static int setting_phone_license_main_cleanup(void *cb);
-
-setting_view setting_view_phone_license_main = {
-       .create = setting_phone_license_main_create,
-       .destroy = setting_phone_license_main_destroy,
-       .update = setting_phone_license_main_update,
-       .cleanup = setting_phone_license_main_cleanup,
-};
-
-/* ***************************************************
- *
- *basic func
- *
- ***************************************************/
-#if SUPPORT_ROAMING_NETWORK
-static void __setting_phone_license_main_exp_cb(void *data, Evas_Object *obj,
-                                               void *event_info)
-{
-       ret_if(NULL == data || NULL == event_info);
-       SETTING_TRACE_BEGIN;
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-       Elm_Object_Item *parentItem = event_info;       /* parent item */
-       Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(parentItem);      /* parent data */
-       Evas_Object *scroller = elm_object_item_widget_get(parentItem);
-
-       Evas_Object *rgd;
-       if (data_parentItem == ad->data_roaming_nw) {
-
-               rgd = elm_radio_add(scroller);
-               elm_radio_value_set(rgd, -1);
-
-               setting_create_Gendial_exp_sub_field(scroller,
-                                                    &(ad->itc_1icon_1text_sub),
-                                                    NULL, NULL, parentItem,
-                                                    SWALLOW_Type_1RADIO, rgd,
-                                                    0,
-                                                    "IDS_ST_BODY_AUTO_DOWNLOAD",
-                                                    NULL);
-
-               setting_create_Gendial_exp_sub_field(scroller,
-                                                    &(ad->itc_1icon_1text_sub),
-                                                    NULL, NULL, parentItem,
-                                                    SWALLOW_Type_1RADIO, rgd,
-                                                    1, "IDS_COM_BODY_MANUAL",
-                                                    NULL);
-
-               setting_create_Gendial_exp_sub_field(scroller,
-                                                    &(ad->itc_1icon_1text_sub),
-                                                    NULL, NULL, parentItem,
-                                                    SWALLOW_Type_1RADIO, rgd,
-                                                    2,
-                                                    "IDS_ST_BODY_ALWAYS_REJECT",
-                                                    NULL);
-
-               setting_update_chk_status(rgd,
-                                         data_parentItem->int_slp_setting_binded);
-
-       }
-}
-#endif
-
-static int setting_phone_license_main_create(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       Evas_Object *scroller;
-
-       /* add basic layout */
-       char setBtnStr[MAX_DISPLAY_NAME_LEN_ON_UI];
-       snprintf(setBtnStr, sizeof(setBtnStr), "%s",
-                (char *)dgettext("sys_string", "IDS_COM_BODY_BACK"));
-       /* scroller is a genlist */
-       ad->ly_license = setting_create_layout_navi_bar_genlist(ad->win_main_layout, ad->win_get, _(KeyStr_License), setBtnStr, NULL,   /* dgettext("sys_string", "IDS_COM_SK_SET"), */
-                                                               setting_phone_license_main_click_softkey_cancel, NULL,  /* setting_phone_license_main_click_softkey_set, */
-                                                               ad, &scroller,
-                                                               &
-                                                               (ad->navi_bar));
-#if SUPPORT_ROAMING_NETWORK
-       setting_enable_expandable_genlist(scroller, ad,
-                                         __setting_phone_license_main_exp_cb,
-                                         NULL);
-#endif
-       Elm_Object_Item *item = NULL;;
-
-       item =
-           elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       int value;
-       int err;
-
-#if SUPPORT_TRANSFER_TRACKING
-       /* tracking */
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_TRANSACTION_TRACKING, &value,
-                                &err);
-       ad->data_tracking =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            setting_phone_license_main_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, value,
-                                            "IDS_ST_BODY_TRANSACTION_TRACKING",
-                                            NULL,
-                                            setting_phone_license_main_chk_btn_cb);
-       if (ad->data_tracking) {
-               ad->data_tracking->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_tracking is NULL");
-       }
-#endif
-
-       /* expiry */
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_EXPIRY_REMINDER, &value,
-                                &err);
-       ad->data_expiry =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            setting_phone_license_main_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, value,
-                                            "IDS_ST_BODY_EXPIRY_REMINDER",
-                                            NULL,
-                                            setting_phone_license_main_chk_btn_cb);
-       if (ad->data_expiry) {
-               ad->data_expiry->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_expiry is NULL");
-       }
-       setting_create_Gendial_field_def(scroller, &(ad->itc_1text),
-                                        setting_phone_license_main_mouse_up_Gendial_list_cb,
-                                        ad, SWALLOW_Type_INVALID, NULL, NULL,
-                                        0, "IDS_ST_HEADER_DIVX_VOD", NULL,
-                                        NULL);
-
-#if SUPPORT_ROAMING_NETWORK
-       /* roaming_nw */
-       char *pa_roaming = get_pa_roaming_network_str();
-       ad->data_roaming_nw =
-           setting_create_Gendial_exp_parent_field(scroller,
-                                                   &(ad->itc_2text_3_parent),
-                                                   NULL, NULL,
-                                                   SWALLOW_Type_INVALID,
-                                                   "IDS_ST_BODY_ROAMING_NETWORK",
-                                                   pa_roaming);
-       if (ad->data_roaming_nw) {
-               ad->data_roaming_nw->int_slp_setting_binded =
-                       INT_SLP_SETTING_ROAMING_NETWORK;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_roaming_nw is NULL");
-       }
-       G_FREE(pa_roaming);
-#endif
-
-       /* Clear license */
-       item =
-           elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       // [UI] open source license
-       setting_create_Gendial_field_def(scroller, &(ad->itc_1text),
-                                        setting_phone_license_main_mouse_up_Gendial_list_cb,
-                                        ad, SWALLOW_Type_INVALID, NULL, NULL,
-                                        0, "IDS_ST_BODY_OPEN_SOURCE_LICENCES",
-                                        NULL, NULL);
-
-#if SUPPORT_CLEAR_LICENSE
-       setting_create_Gendial_field_def(scroller, &(ad->itc_1text),
-                                        setting_phone_license_main_mouse_up_Gendial_list_cb,
-                                        ad, SWALLOW_Type_INVALID, NULL, NULL,
-                                        0, TEXT_CLEAR_LICENSE, NULL, NULL);
-#endif
-
-       item = elm_genlist_item_append(scroller, &itc_bottom_seperator, NULL, NULL,
-                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       setting_view_phone_license_main.is_create = 1;
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_main_destroy(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       if (ad->ly_license != NULL) {
-               SETTING_TRACE("ad->ly_license:%p", ad->ly_license);
-               /* SETTING_TRACE("ad->roaming_nw_dialData:%p", ad->roaming_nw_dialData); */
-               if (ad->popup_clear_license) {
-                       evas_object_del(ad->popup_clear_license);
-                       ad->popup_clear_license = NULL;
-               }
-
-               evas_object_del(ad->ly_license);
-               /* if(ad->roaming_nw_dialData) FREE(ad->roaming_nw_dialData); */
-               setting_view_phone_license_main.is_create = 0;
-       }
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_main_update(void *cb)
-{
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       if (ad->ly_license != NULL) {
-               evas_object_show(ad->ly_license);
-               /* #if SUPPORT_TRANSFER_TRACKING */
-               /* setting_check_onoff_status(ad->chk_tracking, BOOL_SLP_SETTING_TRANSACTION_TRACKING); */
-               /* #endif */
-               /* setting_check_onoff_status(ad->chk_expiry, BOOL_SLP_SETTING_EXPIRY_REMINDER); */
-
-               /* setting_update_chk_status(ad->chk_roaming_nw, INT_SLP_SETTING_ROAMING_NETWORK); */
-               /* edje_object_part_text_set(_EDJ(ad->li_roaming_nw), "bottom.text", get_pa_roaming_network_str()); */
-       }
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_license_main_cleanup(void *cb)
-{
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       if (ad->ly_license != NULL) {
-               /*  evas_object_hide(ad->ly_license); */
-       }
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-void
-setting_phone_license_main_chk_btn_cb(void *data, Evas_Object *obj,
-                                     void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-       SettingPhoneUG *ad = NULL;
-       Setting_GenGroupItem_Data *list_item =
-           (Setting_GenGroupItem_Data *) data;
-       ad = list_item->userdata;
-       list_item->chk_status = elm_check_state_get(obj);       /*  for genlist update status */
-       if (ad->data_tracking)
-               ad->chk_tracking = ad->data_tracking->eo_check;
-       if (ad->data_expiry)
-               ad->chk_expiry = ad->data_expiry->eo_check;
-
-#if SUPPORT_TRANSFER_TRACKING
-       if (obj == ad->chk_tracking) {
-               setting_reset_slp_key_by_status(obj,
-                                               BOOL_SLP_SETTING_TRANSACTION_TRACKING);
-               if (list_item->chk_status) {
-                       ad->popup =
-                           setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                                _(TRANSFER_INFO),
-                                                setting_phone_license_main_popup_resp_cb,
-                                                0, 1, _("IDS_COM_SK_OK"));
-               }
-
-       } else
-#endif
-       if (obj == ad->chk_expiry) {
-               setting_reset_slp_key_by_status(obj,
-                                               BOOL_SLP_SETTING_EXPIRY_REMINDER);
-               if (list_item->chk_status) {
-                       ad->popup =
-                           setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                                _("IDS_ST_BODY_EXPLANATION_FOR_EXPIRY_REMINDER_MENU"),
-                                                setting_phone_license_main_popup_resp_cb,
-                                                0, 1, _("IDS_COM_SK_OK"));
-               }
-       }
-}
-static void __ug_layout_cb(ui_gadget_h ug, enum ug_mode mode,void *priv)
-{
-       SettingPhoneUG *ad = (SettingPhoneUG *) priv;
-       Evas_Object *base;
-
-       if (!priv)
-               return;
-       SETTING_TRACE_BEGIN;
-
-       base = (Evas_Object *) ug_get_layout(ug);
-       if (!base)
-               return;
-
-       switch (mode) {
-       case UG_MODE_FULLVIEW:
-               evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
-                                                EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
-               evas_object_show(base);
-               break;
-       default:
-               break;
-       }
-
-       SETTING_TRACE_END;
-}
-
-static void __ug_destroy_cb(ui_gadget_h ug, void *priv)
-{
-       SETTING_TRACE_BEGIN;
-
-       /* restore the '<-' button on the navigate bar */
-       ret_if(!priv);
-       SettingPhoneUG *ad = (SettingPhoneUG *) priv;   /* ad is point to priv */
-
-       if (ug) {
-               ug_destroy(ug);
-               ad->ug_loading = NULL;
-       }
-
-}
-
-static void __main_license_clicked(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       retm_if(data == NULL, "Data parameter is NULL");
-       SettingPhoneUG *ad = (SettingPhoneUG *)data;
-       struct ug_cbs *cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs));
-       setting_retm_if(cbs == NULL, "calloc failed");
-       cbs->layout_cb = __ug_layout_cb;
-       cbs->result_cb = NULL;
-       cbs->destroy_cb = __ug_destroy_cb;
-       cbs->priv = (void *)ad;
-
-       //bundle *b = bundle_create();
-       service_h svc;
-       if (service_create(&svc)) {
-               FREE(cbs);
-               return;
-       }
-       service_add_extra_data(svc, "file", SETTING_OPEN_SOURCE_LICENSE_PATH);
-       service_add_extra_data(svc, "title", "IDS_ST_BODY_OPEN_SOURCE_LICENCES");
-
-       ad->ug_loading = ug_create(ad->ug, "setting-fileview-efl", UG_MODE_FULLVIEW, svc, cbs);
-       if (NULL == ad->ug_loading) {   /* error handling */
-               setting_create_simple_popup(ad, ad->win_get, NULL, _(UNSUPPORTED_FUNCTION));
-       }
-
-       service_destroy(svc);
-       FREE(cbs);
-}
-
-void
-setting_phone_license_main_mouse_up_Gendial_list_cb(void *data,
-                                                   Evas_Object *obj,
-                                                   void *event_info)
-{
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter 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);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
-
-       if (!safeStrCmp("IDS_ST_HEADER_DIVX_VOD", list_item->keyStr)) {
-               setting_view_change(&setting_view_phone_license_main,
-                                   &setting_view_phone_license_divx_main, ad);
-       }
-#if SUPPORT_TRANSFER_TRACKING
-       else
-           if (!safeStrCmp
-               ("IDS_ST_BODY_TRANSACTION_TRACKING", list_item->keyStr)) {
-               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);
-               int err = 0;
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_TRANSACTION_TRACKING,
-                                        list_item->chk_status, &err);
-               if (list_item->chk_status) {
-                       ad->popup =
-                           setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                                _(TRANSFER_INFO),
-                                                setting_phone_license_main_popup_resp_cb,
-                                                0, 1, dgettext("sys_string", "IDS_COM_SK_OK"));
-               }
-
-       }
-#endif
-       else
-           if (!safeStrCmp("IDS_ST_BODY_EXPIRY_REMINDER", list_item->keyStr)) {
-               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);
-               int err = 0;
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_EXPIRY_REMINDER,
-                                        list_item->chk_status, &err);
-               if (list_item->chk_status) {
-                       ad->popup =
-                           setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                                _("IDS_ST_BODY_EXPLANATION_FOR_EXPIRY_REMINDER_MENU"),
-                                                setting_phone_license_main_popup_resp_cb,
-                                                0, 1, dgettext("sys_string", "IDS_COM_SK_OK"));
-               }
-       } else if (!safeStrCmp(TEXT_CLEAR_LICENSE, list_item->keyStr)) {
-               ad->popup_clear_license =
-                   setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                        _("IDS_ST_POP_LICENCE_WILL_BE_DELETED_CONTINUE_Q"),
-                                        setting_phone_license_clear_license_resp_cb,
-                                        0, 2,
-                                        _("IDS_COM_SK_DELETE"),_("IDS_COM_SK_CANCEL"));
-       }
-       else if (!safeStrCmp("IDS_ST_BODY_OPEN_SOURCE_LICENCES", list_item->keyStr)) {
-                       __main_license_clicked(data);
-       }
-}
-
-void setting_phone_license_clear_license_resp_cb(void *data, Evas_Object *obj,
-                                                void *event_info)
-{
-       int response_type = btn_type(obj);
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-       if (POPUP_RESPONSE_OK == response_type) {
-               //DRM_RESULT ret = drm_svc_remove_all_ro();
-               int ret = drm_trusted_handle_request(DRM_TRUSTED_REQ_TYPE_REMOVE_ALL_RO, NULL, NULL);
-               SETTING_TRACE("ret = %d", ret);
-               if (ret == DRM_TRUSTED_RETURN_SUCCESS) {
-                       setting_create_popup_without_btn(ad, ad->win_get, NULL, _("IDS_COM_POP_SUCCESS"),
-                               NULL, POPUP_INTERVAL, FALSE, FALSE);
-               } else {
-                       setting_create_popup_without_btn(ad, ad->win_get, NULL, _("IDS_COM_POP_FAILED"),
-                               NULL, POPUP_INTERVAL, FALSE, FALSE);
-               }
-       } else if (POPUP_RESPONSE_CANCEL == response_type) {
-       }
-       evas_object_del(ad->popup_clear_license);
-       ad->popup_clear_license = NULL;
-}
-
-void setting_phone_license_main_popup_resp_cb(void *data, Evas_Object *obj,
-                                             void *event_info)
-{
-       int response_type = btn_type(obj);
-       if (POPUP_RESPONSE_OK == response_type) {
-       }
-
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-       if (ad->popup)
-       {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
-
-}
-
-void
-setting_phone_license_main_click_softkey_cancel(void *data, Evas_Object *obj,
-                                               void *event_info)
-{
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       /* modify by kairong78.yin */
-       /* Send destroy request */
-       ug_destroy_me(ad->ug);
-}
diff --git a/setting-phone/src/setting-phone-ticker-notification-details.c b/setting-phone/src/setting-phone-ticker-notification-details.c
deleted file mode 100755 (executable)
index ccda58d..0000000
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <setting-phone-ticker-notification-details.h>
-#include <ail.h>
-
-#define NOTIFICATION_STR "IDS_ST_BODY_NOTIFICATION"
-#define DISPLAY_CONTENT_STR "IDS_ST_BODY_DISPLAY_CONTENTS"
-#define BADGE_STR "IDS_COM_BODY_BADGE_ABB"
-
-#define STR_NOTIFICATION_DETAILS_HELP1 "You can turn off notification of this application. <br> <br>" \
-                                       "If you don't want to see contents in notification popup, turn off the display contents. <br> <br>"\
-                                       "If you don't want to display badge on app icon with a new event number, turn off the Badge."
-
-static int setting_phone_ticker_notification_details_create(void *cb);
-static int setting_phone_ticker_notification_details_destroy(void *cb);
-static int setting_phone_ticker_notification_details_update(void *cb);
-static int setting_phone_ticker_notification_details_cleanup(void *cb);
-
-static void setting_phone_noti_details_chk_btn_cb(void *data, Evas_Object *obj, void *event_info);
-static void setting_phone_noti_details_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj, void *event_info);
-
-static int __status_get_notification_str(char* title);
-static int __status_get_display_contents_str(char* title);
-static int __status_get_badge_str(char* title);
-static void __status_set_display_contents_str(void* data);
-
-setting_view setting_view_phone_ticker_notification_details = {
-       .create = setting_phone_ticker_notification_details_create,
-       .destroy = setting_phone_ticker_notification_details_destroy,
-       .update = setting_phone_ticker_notification_details_update,
-       .cleanup = setting_phone_ticker_notification_details_cleanup,
-};
-
-/* ***************************************************
- *
- *basic func
- *
- ***************************************************/
-char* g_sel_string = NULL;
-SettingPhoneUG *g_phone_ad = NULL;
-
-static int setting_phone_ticker_notification_details_create(void *cb)
-{
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-       g_phone_ad = ad;
-
-       Evas_Object *scroller;
-
-       /* scroller is a genlist */
-       setting_push_layout_navi_bar_genlist(ad->win_main_layout, ad->win_get,
-                                                  _(ad->sel_string),
-                                                  dgettext("sys_string", "IDS_COM_BODY_BACK"),
-                                                  NULL,
-                                                  setting_phone_noti_details_click_softkey_back_cb,
-                                                  NULL, ad, &scroller,
-                                                  ad->navi_bar);
-
-       Elm_Object_Item *item;
-
-       g_sel_string = ad->sel_string;
-
-       // [UI] Separator
-       item =
-           elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       int noti_val = __status_get_notification_str(ad->sel_string);
-
-       // [UI] Notification
-       ad->data_details_notification =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            setting_phone_noti_details_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, noti_val,
-                                            NOTIFICATION_STR, NULL,
-                                            setting_phone_noti_details_chk_btn_cb);
-       if (ad->data_details_notification) {
-               ad->data_details_notification->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_launch_effect is NULL");
-       }
-
-       int display_val = __status_get_display_contents_str(ad->sel_string);
-
-       // [UI] Display contents
-       ad->data_details_display_content =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            setting_phone_noti_details_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, display_val,
-                                            DISPLAY_CONTENT_STR, NULL,
-                                            setting_phone_noti_details_chk_btn_cb);
-       if (ad->data_details_display_content) {
-               ad->data_details_display_content->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_launch_effect is NULL");
-       }
-
-       // [UI] Badge
-       int badge_val = __status_get_badge_str(ad->sel_string);
-       ad->data_details_badge =
-           setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                            setting_phone_noti_details_mouse_up_Gendial_list_cb,
-                                            ad, SWALLOW_Type_1TOGGLE, NULL,
-                                            NULL, badge_val,
-                                            BADGE_STR, NULL,
-                                            setting_phone_noti_details_chk_btn_cb);
-       if (ad->data_details_badge) {
-               ad->data_details_badge->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_launch_effect is NULL");
-       }
-       // [UI] help text 1
-       setting_create_Gendial_field_def(scroller, &(ad->itc_bg_1icon), NULL,
-                       ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
-                       NULL, NULL, 0, STR_NOTIFICATION_DETAILS_HELP1, NULL,
-                       NULL);
-
-       setting_view_phone_ticker_notification_details.is_create = 1;
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_ticker_notification_details_destroy(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       elm_naviframe_item_pop(ad->navi_bar);
-       setting_view_phone_ticker_notification_details.is_create = 0;
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_ticker_notification_details_update(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_ticker_notification_details_cleanup(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       setting_phone_ticker_notification_details_destroy(cb);
-       return SETTING_RETURN_SUCCESS;
-}
-
-/* ***************************************************
- *
- *general func
- *
- ***************************************************/
-
-/* ***************************************************
- *
- *call back func
- *
- ***************************************************/
-
-static void
-setting_phone_noti_details_click_softkey_back_cb(void *data, Evas_Object *obj,
-                                        void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       setting_view_change(&setting_view_phone_ticker_notification_details, &setting_view_phone_ticker_notification, ad);
-}
-
-
-// -1  : failed
-//  0  : off
-//  1  : on
-static int __status_get_notification_str(char* title)
-{
-       SETTING_TRACE_BEGIN;
-       int err;
-       int val = -1;
-
-       if ( 0== safeStrCmp (title, "IDS_COM_BODY_MESSAGES")) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_MESSAGES, &val, &err);
-
-       } else if ( 0== safeStrCmp (title, "IDS_ST_BODY_EMAIL")) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_EMAIL, &val, &err);
-       }
-       /* add new menu */
-       else if ( 0== safeStrCmp (title, "IDS_COM_BODY_INSTANT_MESSENGER")) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_IM, &val, &err);
-       } else if ( 0== safeStrCmp (title, KeyStr_Twitter)) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_TWITTER, &val, &err);
-       } else if ( 0== safeStrCmp (title, KeyStr_Facebook)) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_FACEBOOK, &val, &err);
-       }
-
-       SETTING_TRACE_DEBUG("title : %s, value : %d, err : %d", title, val, err);
-
-       return val;
-}
-
-// -1  : failed
-//  0  : off
-//  1  : on
-static int __status_get_display_contents_str(char* title)
-{
-       SETTING_TRACE_BEGIN;
-       int err;
-       int val = -1;
-
-       if ( 0== safeStrCmp (title, "IDS_COM_BODY_MESSAGES")) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_MESSASGES, &val, &err);
-       } else if ( 0== safeStrCmp (title, "IDS_ST_BODY_EMAIL")) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_EMAIL, &val, &err);
-       }
-       /* add new menu */
-       else if ( 0== safeStrCmp (title, "IDS_COM_BODY_INSTANT_MESSENGER")) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_IM, &val, &err);
-       } else if ( 0== safeStrCmp (title, KeyStr_Twitter)) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_TWITTER, &val, &err);
-       } else if ( 0== safeStrCmp (title, KeyStr_Facebook)) {
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_FACEBOOK, &val, &err);
-       }
-
-       SETTING_TRACE_DEBUG("title : %s, value : %d, err : %d", title, val, err);
-
-       return val;
-}
-static int __status_get_badge_str(char* title)
-{
-       SETTING_TRACE_BEGIN;
-       int val = -1;
-       const char *vconf_key = NULL;
-       if ( 0== safeStrCmp (title, "IDS_COM_BODY_MESSAGES")) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_MESSAGES;
-       } else if ( 0== safeStrCmp (title, "IDS_ST_BODY_EMAIL")) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_EMAIL;
-       }
-       /* add new menu */
-       else if ( 0== safeStrCmp (title, "IDS_COM_BODY_INSTANT_MESSENGER")) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_IM;
-       } else if ( 0== safeStrCmp (title, KeyStr_Twitter)) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_TWITTER;
-       } else if ( 0== safeStrCmp (title, KeyStr_Facebook)) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_FACEBOOK;
-       }
-       SETTING_TRACE("vconf_key:%s", vconf_key);
-       vconf_get_bool(vconf_key, &val);
-       SETTING_TRACE_DEBUG("title : %s, value : %d", title, val);
-       return val;
-}
-
-static void __status_set_notification_str(void* data)
-{
-       SETTING_TRACE_BEGIN;
-       int err;
-       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *)data;
-
-       // message update in previos page
-       Setting_GenGroupItem_Data* item_to_update = NULL;
-
-       char* status;
-
-       if (list_item->chk_status == 1) {
-               status = setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {
-               status = setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-
-       if ( 0== safeStrCmp (g_sel_string, "IDS_COM_BODY_MESSAGES")) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_MESSAGES, list_item->chk_status, &err);
-               item_to_update = g_phone_ad->data_n_msg;
-       } else if ( 0== safeStrCmp (g_sel_string, "IDS_ST_BODY_EMAIL")) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_EMAIL, list_item->chk_status, &err);
-               item_to_update = g_phone_ad->data_n_email;
-       }
-       /* add new menu */
-       else if ( 0== safeStrCmp (g_sel_string, "IDS_COM_BODY_INSTANT_MESSENGER")) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_IM, list_item->chk_status, &err);
-               item_to_update = g_phone_ad->data_n_im;
-       } else if ( 0== safeStrCmp (g_sel_string, KeyStr_Twitter)) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_TWITTER, list_item->chk_status, &err);
-               item_to_update = g_phone_ad->data_n_twt;
-       } else if ( 0== safeStrCmp (g_sel_string, KeyStr_Facebook)) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_FACEBOOK, list_item->chk_status, &err);
-               item_to_update = g_phone_ad->data_n_fb;
-       }
-
-       // update UI
-       if (item_to_update) {
-               item_to_update->sub_desc = strdup(status);
-               elm_object_item_data_set(item_to_update->item,item_to_update);
-               elm_genlist_item_update(item_to_update->item);
-       }
-}
-
-static void __status_set_display_contents_str(void* data)
-{
-       SETTING_TRACE_BEGIN;
-       int err;
-       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *)data;
-
-       // message update in previos page
-
-       char* status;
-
-       if (list_item->chk_status == 1) {
-               status = setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {
-               status = setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-
-       if ( 0== safeStrCmp (g_sel_string, "IDS_COM_BODY_MESSAGES")) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_MESSASGES, list_item->chk_status, &err);
-       } else if ( 0== safeStrCmp (g_sel_string, "IDS_ST_BODY_EMAIL")) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_EMAIL, list_item->chk_status, &err);
-       }
-       /* add new menu */
-       else if ( 0== safeStrCmp (g_sel_string, "IDS_COM_BODY_INSTANT_MESSENGER")) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_IM, list_item->chk_status, &err);
-       } else if ( 0== safeStrCmp (g_sel_string, KeyStr_Twitter)) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_TWITTER, list_item->chk_status, &err);
-       } else if ( 0== safeStrCmp (g_sel_string, KeyStr_Facebook)) {
-               setting_set_bool_slp_key(BOOL_SLP_SETTING_NOTI_DISPLAY_CONTENT_FACEBOOK, list_item->chk_status, &err);
-       }
-}
-
-static void __status_set_badge_str(void* data)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *)data;
-
-       char *status = NULL;
-
-       if (list_item->chk_status == 1) {
-               status = setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {
-               status = setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-
-       SETTING_TRACE("g_sel_string:%s", g_sel_string);
-       const char *vconf_key = NULL;
-       if ( 0== safeStrCmp (g_sel_string, "IDS_COM_BODY_MESSAGES")) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_MESSAGES;
-       } else if ( 0== safeStrCmp (g_sel_string, "IDS_ST_BODY_EMAIL")) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_EMAIL;
-       }
-       /* add new menu */
-       else if ( 0== safeStrCmp (g_sel_string, "IDS_COM_BODY_INSTANT_MESSENGER")) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_IM;
-       } else if ( 0== safeStrCmp (g_sel_string, KeyStr_Twitter)) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_TWITTER;
-       } else if ( 0== safeStrCmp (g_sel_string, KeyStr_Facebook)) {
-               vconf_key = VCONFKEY_TICKER_NOTI_BADGE_FACEBOOK;
-       }
-       SETTING_TRACE("vconf_key:%s", vconf_key);
-       int ret = vconf_set_bool(vconf_key, list_item->chk_status);
-       setting_retm_if(ret != 0, "fail to set vconf");
-}
-
-/**
- * genlist click
- */
-static void setting_phone_noti_details_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter 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);
-
-
-       int old_status = elm_check_state_get(list_item->eo_check);
-       list_item->chk_status = !old_status;
-       elm_check_state_set(list_item->eo_check, list_item->chk_status);        /* new status */
-
-       if ( 0== safeStrCmp (list_item->keyStr, NOTIFICATION_STR)) {
-               __status_set_notification_str(list_item);
-       } else if ( 0== safeStrCmp (list_item->keyStr, DISPLAY_CONTENT_STR)) {
-               // vconf setting by g_sel_string
-               __status_set_display_contents_str(list_item);
-       }  else if ( 0== safeStrCmp (list_item->keyStr, BADGE_STR)) {
-               __status_set_badge_str(list_item);
-       }
-}
-
-
-/**
- * check box
- */
-static void setting_phone_noti_details_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
- {
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
-       list_item->chk_status = elm_check_state_get(obj);       /*  for genlist update status */
-
-       if ( 0== safeStrCmp (list_item->keyStr, NOTIFICATION_STR)) {
-               __status_set_notification_str(list_item);
-       } else if ( 0== safeStrCmp (list_item->keyStr, DISPLAY_CONTENT_STR)) {
-               __status_set_display_contents_str(list_item);
-       } else if ( 0== safeStrCmp (list_item->keyStr, BADGE_STR)) {
-               __status_set_badge_str(list_item);
-       }
- }
-
diff --git a/setting-phone/src/setting-phone-ticker-notification.c b/setting-phone/src/setting-phone-ticker-notification.c
deleted file mode 100755 (executable)
index 461fe17..0000000
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * setting
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <setting-phone-ticker-notification.h>
-#include <ail.h>
-#define SUPPORT_TWITTER                0
-#define SUPPORT_FACEBOOK       0
-static void get_3rd_applist(void *data, Evas_Object *scroller);
-
-static char *get_appname(char *keyname);
-
-static int setting_phone_ticker_notfication_create(void *cb);
-static int setting_phone_ticker_notfication_destroy(void *cb);
-static int setting_phone_ticker_notfication_update(void *cb);
-static int setting_phone_ticker_notfication_cleanup(void *cb);
-
-setting_view setting_view_phone_ticker_notification = {
-       .create = setting_phone_ticker_notfication_create,
-       .destroy = setting_phone_ticker_notfication_destroy,
-       .update = setting_phone_ticker_notfication_update,
-       .cleanup = setting_phone_ticker_notfication_cleanup,
-};
-
-/* ***************************************************
- *
- *basic func
- *
- ***************************************************/
-
-static int setting_phone_ticker_notfication_create(void *cb)
-{
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       Evas_Object *scroller;
-
-       /* scroller is a genlist */
-       ad->ly_ticker =
-           setting_create_layout_navi_bar_genlist(ad->win_main_layout,
-                                                  ad->win_get,
-                                                  setting_gettext("IDS_ST_BODY_EVENTS_NOTIFICATIONS"),
-                                                  dgettext("sys_string", "IDS_COM_BODY_BACK"),
-                                                  NULL,
-                                                  setting_phone_noti_click_softkey_back_cb,
-                                                  NULL, ad, &scroller,
-                                                  &(ad->navi_bar));
-       int value;
-       int err;
-       Elm_Object_Item *item;
-       char* status = "";
-       item = elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-       // [UI] Email
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_EMAIL, &value, &err);
-       if (value == 1) {
-               status = setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {
-               status = setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-
-       ad->data_n_email =
-           setting_create_Gendial_field_groupitem(scroller,
-                                               &(ad->itc_1icon_2text),
-                                               NULL,
-                                           setting_phone_noti_mouse_up_Gendial_list_cb,
-                                           ad,
-                                               SWALLOW_Type_INVALID,
-                                               NULL,
-                                           NULL,
-                                               value, /* chk_status*/
-                                           "IDS_ST_BODY_EMAIL",
-                                           status, /* sub_desk*/
-                                           setting_phone_noti_mouse_up_chk_btn_cb);
-       if (ad->data_n_email) {
-               ad->data_n_email->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_n_email is NULL");
-       }
-
-       // [UI] Messages
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_MESSAGES, &value, &err);
-       if (value == 1) {
-               status = setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {
-               status = setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-
-       ad->data_n_msg =
-           setting_create_Gendial_field_groupitem(scroller,
-                                               &(ad->itc_1icon_2text),
-                                               NULL,
-                                           setting_phone_noti_mouse_up_Gendial_list_cb,
-                                           ad,
-                                               SWALLOW_Type_INVALID,
-                                               NULL,
-                                           NULL,
-                                               value, /* chk_status*/
-                                           "IDS_COM_BODY_MESSAGES",
-                                           status, /* sub_desk*/
-                                           setting_phone_noti_mouse_up_chk_btn_cb);
-       if (ad->data_n_msg) {
-               ad->data_n_msg->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_n_msg is NULL");
-       }
-
-       // [UI] Instant messenger
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_IM, &value, &err);
-       if (value == 1) {
-               status = setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {
-               status = setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-
-       ad->data_n_im =
-           setting_create_Gendial_field_groupitem(scroller,
-                                               &(ad->itc_1icon_2text),
-                                               NULL,
-                                           setting_phone_noti_mouse_up_Gendial_list_cb,
-                                           ad,
-                                               SWALLOW_Type_INVALID,
-                                               NULL,
-                                           NULL,
-                                               value, /* chk_status*/
-                                           "IDS_COM_BODY_INSTANT_MESSENGER",
-                                           status, /* sub_desk*/
-                                           setting_phone_noti_mouse_up_chk_btn_cb);
-       if (ad->data_n_im) {
-               ad->data_n_im->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_n_im is NULL");
-       }
-
-#if SUPPORT_FACEBOOK
-       // [UI] Facebook
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_FACEBOOK, &value, &err);
-       if (value == 1) {
-               status = setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {
-               status = setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-
-       ad->data_n_fb =
-           setting_create_Gendial_field_groupitem(scroller,
-                                               &(ad->itc_1icon_2text),
-                                               NULL,
-                                           setting_phone_noti_mouse_up_Gendial_list_cb,
-                                           ad,
-                                               SWALLOW_Type_INVALID,
-                                               NULL,
-                                           NULL,
-                                               value, /* chk_status*/
-                                           KeyStr_Facebook,
-                                           status, /* sub_desk*/
-                                           setting_phone_noti_mouse_up_chk_btn_cb);
-       if (ad->data_n_fb) {
-               ad->data_n_fb->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_n_msg is NULL");
-       }
-#endif
-
-#if SUPPORT_TWITTER
-       // [UI] Twitter
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_TICKER_NOTI_TWITTER, &value, &err);
-       if (value == 1) {
-               status = setting_gettext("IDS_COM_BODY_ON_M_STATUS");
-       } else {
-               status = setting_gettext("IDS_COM_BODY_OFF_M_STATUS");
-       }
-
-       ad->data_n_twt =
-           setting_create_Gendial_field_groupitem(scroller,
-                                               &(ad->itc_1icon_2text),
-                                               NULL,
-                                           setting_phone_noti_mouse_up_Gendial_list_cb,
-                                           ad,
-                                               SWALLOW_Type_INVALID,
-                                               NULL,
-                                           NULL,
-                                               value, /* chk_status*/
-                                           KeyStr_Twitter,
-                                           status, /* sub_desk*/
-                                           setting_phone_noti_mouse_up_chk_btn_cb);
-       if (ad->data_n_twt) {
-               ad->data_n_twt->userdata = ad;
-       } else {
-               SETTING_TRACE_ERROR("ad->data_n_msg is NULL");
-       }
-#endif
-       // [UI] list of 3rd party apps
-#if APP_3RD_LIST
-       get_3rd_applist(ad, scroller);
-#endif
-
-       setting_view_phone_ticker_notification.is_create = 1;
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_ticker_notfication_destroy(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       if (ad->ly_ticker != NULL) {
-               evas_object_del(ad->ly_ticker);
-               setting_view_phone_ticker_notification.is_create = 0;
-       }
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_ticker_notfication_update(void *cb)
-{
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       if (ad->ly_ticker != NULL) {
-               evas_object_show(ad->ly_ticker);
-       }
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_phone_ticker_notfication_cleanup(void *cb)
-{
-       /* error check */
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) cb;
-
-       if (ad->ly_ticker != NULL) {
-               evas_object_hide(ad->ly_ticker);
-       }
-
-       return SETTING_RETURN_SUCCESS;
-}
-
-/* ***************************************************
- *
- *general func
- *
- ***************************************************/
-
-/* ***************************************************
- *
- *call back func
- *
- ***************************************************/
-
-static void setting_phone_noti_mouse_up_chk_btn_cb(void *data, Evas_Object *obj,
-                                      void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       return;
-}
-
-static void
-setting_phone_noti_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
-                                           void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       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);
-
-       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 ( 0== safeStrCmp (list_item->keyStr, "IDS_ST_BODY_DISPLAY_CONTENTS")) {
-               ad->sel_string = "IDS_ST_BODY_DISPLAY_CONTENTS";
-
-    } else if ( 0== safeStrCmp (list_item->keyStr, "IDS_COM_BODY_MESSAGES")) {
-               ad->sel_string = "IDS_COM_BODY_MESSAGES";
-
-    } else if ( 0== safeStrCmp (list_item->keyStr, "IDS_ST_BODY_EMAIL")) {
-               ad->sel_string = "IDS_ST_BODY_EMAIL";
-
-    }
-       /* add new menue */
-       else if ( 0== safeStrCmp (list_item->keyStr, "IDS_COM_BODY_INSTANT_MESSENGER")) {
-               ad->sel_string = "IDS_COM_BODY_INSTANT_MESSENGER";
-    } else if ( 0== safeStrCmp (list_item->keyStr, KeyStr_Twitter)) {
-               ad->sel_string = KeyStr_Twitter;
-    } else if ( 0== safeStrCmp (list_item->keyStr, KeyStr_Facebook)) {
-               ad->sel_string = KeyStr_Facebook;
-       }
-
-
-       // go to 'details' page
-       setting_view_change(&setting_view_phone_ticker_notification, &setting_view_phone_ticker_notification_details, ad);
-}
-
-static void
-setting_phone_noti_click_softkey_back_cb(void *data, Evas_Object *obj,
-                                        void *event_info)
-{
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       /* Send destroy request */
-       ug_destroy_me(ad->ug);
-}
-
-/*****/
-
-static void
-setting_phone_noti_3rd_apps_chk_btn_cb(void *data, Evas_Object *obj,
-                                      void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-       Setting_GenGroupItem_Data *list_item =
-           (Setting_GenGroupItem_Data *) data;
-       /* SettingPhoneUG *ad = list_item->userdata; */
-       list_item->chk_status = elm_check_state_get(obj);       /*  for genlist update status */
-
-       if (0 != vconf_set_int(list_item->sub_desc, list_item->chk_status)) {
-               SETTING_TRACE("Set vconf[%s] failed", list_item->sub_desc);
-               /*  restore if failed */
-               list_item->chk_status = !list_item->chk_status;
-               elm_check_state_set(list_item->eo_check, list_item->chk_status);
-       } else {
-               SETTING_TRACE("Set vconf[%s] success", list_item->sub_desc);
-
-               int ret = -1;
-               ret = vconf_set_int(list_item->sub_desc, list_item->chk_status);
-               if (ret) {
-                       SETTING_TRACE("Set vconf[%s] failed",
-                                     list_item->sub_desc);
-               } else {
-                       ret =
-                           heynoti_publish
-                           ("setting_event_noti_3rdapp_changed");
-                       SETTING_TRACE("heynoti publish ret = %d ", ret);
-                       if (ret < 0) {
-                               SETTING_TRACE_ERROR
-                                   ("heynoti_publish error - [%d] failed",
-                                    ret);
-                       }
-               }
-
-               if (ret < 0) {
-                       SETTING_TRACE("heynoti publish ret = %d ", ret);
-                       /*  restore if failed */
-                       list_item->chk_status = !list_item->chk_status;
-                       elm_check_state_set(list_item->eo_check,
-                                           list_item->chk_status);
-               }
-       }
-}
-
-static void
-setting_phone_noti_3rd_apps_mouse_up_Gendial_list_cb(void *data,
-                                                    Evas_Object *obj,
-                                                    void *event_info)
-{
-       /* error check */
-       setting_retm_if(data == NULL, "Data parameter 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);
-
-       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);
-}
-
-/**
- * 3rd party apps list
- */
-static void get_3rd_applist(void *data, Evas_Object *scroller)
-{
-       SettingPhoneUG *ad = (SettingPhoneUG *) data;
-
-       keylist_t *kl = NULL;
-       keynode_t *temp_node = NULL;
-
-       kl = vconf_keylist_new();
-
-       int i = 0;
-       while ((temp_node = vconf_keylist_nextnode(kl))) {
-               /*  draw a node */
-               if (VCONF_TYPE_INT == vconf_keynode_get_type(temp_node)) {
-                       SETTING_TRACE("key = %s, value = %d",
-                                     vconf_keynode_get_name(temp_node),
-                                     vconf_keynode_get_int(temp_node));
-                       /*  draw control */
-                       int val = vconf_keynode_get_int(temp_node);
-
-                       /*  get applist */
-                       char *vconf_key = vconf_keynode_get_name(temp_node);    /*  key */
-
-                       /*  get app name with app_pkg_name and AIL */
-                       /*  parsing */
-                       char *app_name = get_appname(vconf_key);
-                       if (!app_name) {
-                               app_name = strdup("UNTITLED");
-                       }
-
-                       i++;
-                       if (i == 1) {
-                               Elm_Object_Item *item = NULL;
-                               item = elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-                               setting_retm_if(item == NULL, "elm_genlist_item_append failed");
-                               elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-                       }
-
-                       /*  get app name */
-                       Setting_GenGroupItem_Data *obj =
-                           setting_create_Gendial_field_def(scroller,
-                                                            &(ad->
-                                                              itc_1text_1icon),
-                                                            setting_phone_noti_3rd_apps_mouse_up_Gendial_list_cb,
-                                                            ad,
-                                                            SWALLOW_Type_1TOGGLE,
-                                                            NULL, NULL,
-                                                            val, app_name,
-                                                            NULL,
-                                                            setting_phone_noti_3rd_apps_chk_btn_cb);
-                       if (obj) {
-                               obj->sub_desc = (char *)g_strdup(vconf_key);
-                               ad->app_list = eina_list_append(ad->app_list, obj);     /*  resources are freed at itc structure. */
-                       } else {
-                               SETTING_TRACE_ERROR("obj is NULL");
-                       }
-
-                       if (app_name) {
-                               free(app_name);
-                               app_name = NULL;
-                       }
-
-               } else {
-                       SETTING_TRACE("Unknown Type\n");
-               }
-       }
-       vconf_keylist_free(kl);
-}
-
-/*  utility*/
-static char *strrstr(const char *str, const char *strSearch)
-{
-       char *ptr, *last = NULL;
-       ptr = (char *)str;
-       while ((ptr = strstr(ptr, strSearch)))
-               last = ptr++;
-       return last;
-}
-
-
-static char* package_get_name(char* package, int* err_ref)
-{
-    ail_appinfo_h handle;
-    ail_error_e ret;
-
-    char *str = NULL;
-    char *ret_str = NULL;
-
-       int err = -1;
-
-    ret = ail_package_get_appinfo(package, &handle);
-    if (ret != AIL_ERROR_OK) {
-        err =  AIL_ERROR_FAIL;
-    }
-
-    ret = ail_appinfo_get_str(handle, AIL_PROP_NAME_STR, &str);
-    if (ret != AIL_ERROR_OK) {
-        err =  AIL_ERROR_FAIL;
-    }
-
-       if (str) {
-               ret_str = strdup(str);
-       } else {
-               SETTING_TRACE_ERROR("str is NULL");
-       }
-    SETTING_TRACE("1 Package[%s] : %s", package, ret_str);
-
-    ret = ail_package_destroy_appinfo(handle);
-    if (ret != AIL_ERROR_OK) {
-        err =  AIL_ERROR_FAIL;
-    }
-
-       *err_ref = err;
-    SETTING_TRACE("2 Package[%s] : %s", package, ret_str);
-       return ret_str;
-}
-
-
-/*  input : package name*/
-
-/*  outout : app name*/
-static char *get_appname(char *keyname)
-{
-       int err = -1;
-
-       char* pkg_name = strrstr(keyname, "/");
-       pkg_name++;
-       char *ret2 = package_get_name(pkg_name, &err);
-
-       if (ret2) {
-               SETTING_TRACE("app name : %s", ret2);
-               return ret2;
-       } else {
-               return strdup("UNTITLED");
-       }
-}
-
index e954bdb..1d136cb 100755 (executable)
@@ -65,11 +65,6 @@ setting_view *__get_phone_view_to_load(service_h service)
 
                        return &setting_view_phone_language_region;
                }
-       } else if (!safeStrCmp(viewtype, "notification")) {
-               setting_view_node_table_register(&setting_view_phone_ticker_notification, NULL);
-               setting_view_node_table_register(&setting_view_phone_ticker_notification_details, &setting_view_phone_ticker_notification);
-
-               return &setting_view_phone_ticker_notification;
        } else {
                return NULL;    /* &setting_view_phone_main; */
        }
@@ -88,8 +83,6 @@ Evas_Object *__get_phone_layout_to_return(service_h service, void *priv)
 
        if (!safeStrCmp(viewtype, "language")) {
                return phoneUG->ly_language;
-       } else if (!safeStrCmp(viewtype, "notification")) {
-               return phoneUG->ly_ticker;
        } else {
                return NULL;    /* &setting_view_phone_main; */
        }
@@ -488,11 +481,6 @@ static void setting_phone_ug_on_destroy(ui_gadget_h ug, service_h service,
                setting_view_destroy(&setting_view_phone_region_format,
                                     phoneUG);
                setting_view_destroy(&setting_view_phone_language_region, phoneUG);
-       } else if (&setting_view_phone_ticker_notification ==
-                  phoneUG->view_to_load) {
-               setting_view_destroy(&setting_view_phone_ticker_notification,
-                                    phoneUG);
-               setting_view_destroy(&setting_view_phone_ticker_notification_details, phoneUG);
        }
 
        if (NULL != ug_get_layout(phoneUG->ug)) {
@@ -642,42 +630,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
 #if SUPPORT_RUN_SYSTEM_COMMAND
        ret += excuteCmd(SETTING_POSTINST_FILE, 1, ug_type);
 #else
-       if (0 == safeStrCmp(ug_type, "notification")) {
-               ret +=
-                   vconf_set_bool(VCONFKEY_SETAPPL_STATE_TICKER_NOTI_MESSAGES_BOOL, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_SETAPPL_STATE_TICKER_NOTI_EMAIL_BOOL, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_SETAPPL_STATE_TICKER_NOTI_IM_BOOL, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_SETAPPL_STATE_TICKER_NOTI_FACEBOOK_BOOL, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_SETAPPL_STATE_TICKER_NOTI_TWITTER_BOOL, TRUE);
-
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_MESSASGES, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_EMAIL, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_IM, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_FACEBOOK, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_DISPLAY_CONTENT_TWITTER, TRUE);
-
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_BADGE_MESSAGES, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_BADGE_EMAIL, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_BADGE_IM, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_BADGE_FACEBOOK, TRUE);
-               ret +=
-                   vconf_set_bool(VCONFKEY_TICKER_NOTI_BADGE_TWITTER, TRUE);
-
-
-       } else if (0 == safeStrCmp(ug_type, "language")) {
+       if (0 == safeStrCmp(ug_type, "language")) {
                // INT_SLP_SETTING_LANG
                ret += vconf_set_int(VCONFKEY_SETAPPL_LANG_INT, SETTING_LANG_ENGLISH);
                ret += vconf_set_str(VCONFKEY_LANGSET, "en_US.UTF-8");
index 13f2153..714c761 100755 (executable)
@@ -25,6 +25,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 ADD_LIBRARY(${SETTING_STORAGE_UG} SHARED
        ./src/setting-storage.c
        ./src/setting-storage-main.c
+       ./src/setting-storage-default-storage.c
        )
 
 TARGET_LINK_LIBRARIES(${SETTING_STORAGE_UG} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
  * limitations under the License.
  *
  */
-#ifndef __SETTING_DISPLAY_SMART_SCREEN_H__
-#define __SETTING_DISPLAY_SMART_SCREEN_H__
+#ifndef __SETTING_STORAGE_DEFAULT_STORAGE_H__
+#define __SETTING_STORAGE_DEFAULT_STORAGE_H__
 
-#include <setting-display.h>
+#include <setting-storage.h>
 
+#define DVB_H_STR "DVB-H"
 
-static void __setting_display_smart_screen_click_softkey_back_cb(void *data, Evas_Object *obj,
-                                          void *event_info);
-
-#endif                         /* __SETTING_DISPLAY_SMART_SCREEN_H__ */
+#endif                         /* __SETTING_STORAGE_DEFAULT_STORAGE_H__ */
index f44b128..64a7c37 100755 (executable)
 #include <setting-common-draw-widget.h>
 #include <setting-common-view.h>
 
+#define SETTING_STORAGE_PROGRESSBAR_TIMEOUT 10
+#define SETTING_STORAGE_POPUP_TIMER    2
+
 #define SETTING_STORAGE_MAX_STR_LEN                    30
 
 #define SETTING_STORAGE_DIR_PATH_LEN_MAX               4096
 #define SETTING_STORAGE_FILE_NAME_LEN_MAX              256
 #define SETTING_STORAGE_CHILDPATH_LEN                  512
 
-
 #define SETTING_STORAGE_KILOBYTE_VALUE                 1024
 #define SETTING_STORAGE_MEGABYTE_VALUE                 1048576
 #define SETTING_STORAGE_GIGABYTE_VALUE                 1073741824
 
+#define SETTING_STORAGE_FORMAT_ASK_MSG "This action will erase the external storage in the phone. You will lose ALL data on the card! Format?"
+
+#define SETTING_STORAGE_SD_CARD_MOUNT_ALREADY_DESC "Already mount"
+
+#define SETTING_STORAGE_DEFAULT_STORAGE_STR "Default storage"
+#define SETTING_STORAGE_INTERNAL_STORAGE_STR "Internal storage"
+#define SETTING_STORAGE_PICS_STR "IDS_ST_BODY_PICTURES_VIDEOS"
+#define SETTING_STORAGE_DOWNS_STR "IDS_ST_BODY_DOWNLOADS"
+#define SETTING_STORAGE_MISCES_STR "IDS_ST_BODY_MISCELLANEOUS_FILES"
+#define SETTING_STORAGE_AVAIL_STR "IDS_ST_BODY_AVAILABLE"
+#define SETTING_STORAGE_FORMAT_STR "IDS_ST_BODY_FORMAT_USB_STORAGE"
+#define SETTING_STORAGE_FORMAT_DESC_STR "Erases all data on the internal USB storage, such as music and photos"
+#define SETTING_STORAGE_MOUNT_STR "IDS_ST_BODY_MOUNT_SD_CARD"
+#define SETTING_STORAGE_INSERT_STR "IDS_ST_BODY_INSERT_SD_CARD"
+
+#define SETTING_STORAGE_APPS_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_applications.png"
+#define SETTING_STORAGE_PICS_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_pictures.png"
+#define SETTING_STORAGE_DOWNS_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_downloads.png"
+#define SETTING_STORAGE_MISCES_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_miscellaneous_files.png"
+#define SETTING_STORAGE_AVAIL_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_available.png"
+
+#define SETTING_STORAGE_ICON_WIDTH ((int)640 * WIDGET_SCALE_FACTOR)
+#define SETTING_STORAGE_ICON_HEIGHT ((int)16 * WIDGET_SCALE_FACTOR)
+
+#define SETTING_STORAGE_OPT_PATH               "/opt"
+#define SETTING_STORAGE_MEDIA_PATH             "/opt/media"
+#define SETTING_STORAGE_PICTURES_PATH          "/opt/media/Images"
+#define SETTING_STORAGE_VIDEOS_PATH            "/opt/media/Videos"
+#define SETTING_STORAGE_DOWNLOADS_PATH         "/opt/media/Downloads"
+#define SETTING_STORAGE_MMC_PATH               "/opt/storage/sdcard"
+#define SETTING_STORAGE_MMC_PARENT_PATH        "/opt/storage/sdcard/.."
+
+enum {
+       SETTING_STORAGE_SYSMAN_REQUEST_MOUNT_ALREADY = -2,
+       SETTING_STORAGE_SYSMAN_REQUEST_SUCCESS = 0
+};
+
+
+typedef void (*setting_storage_mmc_cb) (int val, void *data);
+
 typedef struct _Setting_Storage_Status {
        double  dTotal;
        double  dAvail;
@@ -97,8 +139,24 @@ struct _SettingStorageUG {
        Setting_GenGroupItem_Data *downloads;
        Setting_GenGroupItem_Data *others;
        Setting_GenGroupItem_Data *avail;
+
+       Setting_GenGroupItem_Data *sd_mount;
+       Setting_GenGroupItem_Data *sd_total;
+       Setting_GenGroupItem_Data *sd_available;
+       Setting_GenGroupItem_Data *sd_format;
+
+       struct mmc_contents *mmc_content;
+
+       /* default storage */
+       Setting_GenGroupItem_Data *data_wap;
+       Setting_GenGroupItem_Data *data_bt;
+       Setting_GenGroupItem_Data *data_cmr;
+       Setting_GenGroupItem_Data *data_vrec;
+       Setting_GenGroupItem_Data *data_rdo;
+       Setting_GenGroupItem_Data *data_dvb_h;
 };
 
 extern setting_view setting_view_storage_main;
+extern setting_view setting_view_storage_default_storage;
 
 #endif                         /* __SETTING_STORAGE_H__ */
diff --git a/setting-storage/src/setting-storage-default-storage.c b/setting-storage/src/setting-storage-default-storage.c
new file mode 100755 (executable)
index 0000000..c5be7b4
--- /dev/null
@@ -0,0 +1,388 @@
+/*
+ * setting
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
+ *
+ * Contact: MyoungJune Park <mj2004.park@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+#include <setting-storage-default-storage.h>
+
+static int setting_storage_default_storage_create(void *cb);
+static int setting_storage_default_storage_destroy(void *cb);
+static int setting_storage_default_storage_update(void *cb);
+static int setting_storage_default_storage_cleanup(void *cb);
+static char* __setting_storage_default_storage_desc_get(setting_int_slp_list slp_key);
+
+setting_view setting_view_storage_default_storage = {
+       .create = setting_storage_default_storage_create,
+       .destroy = setting_storage_default_storage_destroy,
+       .update = setting_storage_default_storage_update,
+       .cleanup = setting_storage_default_storage_cleanup,
+};
+
+static void __setting_storage_default_storage_cancel_cb(void *data, Evas_Object *obj, void *event_info);
+static void __setting_storage_default_storage_vconf_change_cb(keynode_t *key, void *data);
+static void __setting_storage_default_storage_update_item_status(void *data, Eina_Bool disable_mmc_flag);
+static void __setting_storage_default_storage_update_vconf(void *data);
+
+/* ***************************************************
+ *
+ *basic func
+ *
+ ***************************************************/
+static void __setting_storage_default_storage_exp_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(NULL == data, "data is NULL");
+       setting_retm_if(NULL == event_info, "event_info is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+       Elm_Object_Item *parentItem = event_info;       /* parent item */
+
+       Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(parentItem);      /* parent data */
+       Evas_Object *scroller = elm_object_item_widget_get(parentItem);
+
+       Evas_Object *rgd = NULL;
+       if (data_parentItem == ad->data_wap
+           || data_parentItem == ad->data_bt
+           || data_parentItem == ad->data_cmr
+           || data_parentItem == ad->data_vrec
+           || data_parentItem == ad->data_rdo
+           || data_parentItem == ad->data_dvb_h) {
+               SETTING_TRACE("start drawing exp menu.");
+
+               rgd = elm_radio_add(scroller);
+               elm_radio_value_set(rgd, -1);
+               setting_create_Gendial_exp_sub_field(scroller,
+                                                    &(ad->itc_1icon_1text_sub),
+                                                    NULL, NULL, parentItem,
+                                                    SWALLOW_Type_1RADIO, rgd,
+                                                    SETTING_DEF_MEMORY_PHONE,
+                                                    "IDS_COM_BODY_PHONE",
+                                                    NULL);
+
+                Setting_GenGroupItem_Data *data_memory_card = NULL;
+                data_memory_card =
+                        setting_create_Gendial_exp_sub_field(scroller,
+                                                    &(ad->itc_1icon_1text_sub),
+                                                    NULL, NULL, parentItem,
+                                                    SWALLOW_Type_1RADIO, rgd,
+                                                    SETTING_DEF_MEMORY_MMC,
+                                                    "IDS_COM_BODY_MEMORY_CARD",
+                                                    NULL);
+                setting_retm_if(!data_memory_card, "data_memory_card is NULL");
+
+                int mmc_mode = VCONFKEY_SYSMAN_MMC_REMOVED;
+                int ret = vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &mmc_mode);
+                setting_retm_if(ret != 0, "Get vconf failed");
+
+                /* if mmc card is not mounted, set item disable */
+                if (mmc_mode == VCONFKEY_SYSMAN_MMC_REMOVED ||
+                        mmc_mode == VCONFKEY_SYSMAN_MMC_INSERTED_NOT_MOUNTED) {
+                        setting_disable_genlist_item(data_memory_card->item);
+                }
+
+               setting_update_chk_status(rgd, data_parentItem->int_slp_setting_binded);
+       }
+}
+
+static int setting_storage_default_storage_create(void *cb)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retvm_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER, "cb is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *)cb;
+
+       Evas_Object *scroller = NULL;
+       Elm_Object_Item *item = NULL;
+       setting_push_layout_navi_bar_genlist(ad->win_main_layout, ad->win_get,
+                                            _(SETTING_STORAGE_DEFAULT_STORAGE_STR),
+                                            _("IDS_COM_BODY_BACK"), NULL,
+                                            __setting_storage_default_storage_cancel_cb,
+                                            NULL, ad, &scroller, ad->navibar);
+
+       setting_enable_expandable_genlist(scroller, ad,
+                                         __setting_storage_default_storage_exp_cb, NULL);
+
+       item = elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
+                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
+       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+       /* 1 wap downloads */
+       ad->data_wap = setting_create_Gendial_exp_parent_field(scroller, &(ad->itc_2text_3_parent),
+                                                   NULL, NULL, SWALLOW_Type_INVALID,
+                                                   "IDS_ST_BODY_WAP_DOWNLOADS",
+                                                   __setting_storage_default_storage_desc_get(INT_SLP_SETTING_DEFAULT_MEM_WAP));
+       if (ad->data_wap) {
+               ad->data_wap->int_slp_setting_binded = INT_SLP_SETTING_DEFAULT_MEM_WAP;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_wap is NULL");
+       }
+
+       /* 2 bluetooth */
+       ad->data_bt = setting_create_Gendial_exp_parent_field(scroller, &(ad->itc_2text_3_parent),
+                                                   NULL, NULL, SWALLOW_Type_INVALID,
+                                                   "IDS_COM_BODY_BLUETOOTH",
+                                                   __setting_storage_default_storage_desc_get(INT_SLP_SETTING_DEFAULT_MEM_BLUETOOTH));
+       if (ad->data_bt) {
+               ad->data_bt->int_slp_setting_binded = INT_SLP_SETTING_DEFAULT_MEM_BLUETOOTH;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_bt is NULL");
+       }
+
+       /* 3 camera */
+       ad->data_cmr = setting_create_Gendial_exp_parent_field(scroller, &(ad->itc_2text_3_parent),
+                                                   NULL, NULL, SWALLOW_Type_INVALID,
+                                                   "IDS_COM_BODY_CAMERA",
+                                                   __setting_storage_default_storage_desc_get(INT_SLP_SETTING_DEFAULT_MEM_CAMERA));
+       if (ad->data_cmr) {
+               ad->data_cmr->int_slp_setting_binded = INT_SLP_SETTING_DEFAULT_MEM_CAMERA;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_cmr is NULL");
+       }
+
+       /* 4 video recorder */
+       ad->data_vrec = setting_create_Gendial_exp_parent_field(scroller, &(ad->itc_2text_3_parent),
+                                                   NULL, NULL, SWALLOW_Type_INVALID,
+                                                   "IDS_COM_BODY_VOICE_RECORDER",
+                                                   __setting_storage_default_storage_desc_get(INT_SLP_SETTING_DEFAULT_MEM_VOICE_RECORDER));
+       if (ad->data_vrec) {
+               ad->data_vrec->int_slp_setting_binded = INT_SLP_SETTING_DEFAULT_MEM_VOICE_RECORDER;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_vrec is NULL");
+       }
+
+       /* 5 FM radio */
+       ad->data_rdo = setting_create_Gendial_exp_parent_field(scroller, &(ad->itc_2text_3_parent),
+                                                   NULL, NULL, SWALLOW_Type_INVALID,
+                                                   "IDS_COM_BODY_FM_RADIO",
+                                                   __setting_storage_default_storage_desc_get(INT_SLP_SETTING_DEFAULT_MEM_FM_RADIO));
+       if (ad->data_rdo) {
+               ad->data_rdo->int_slp_setting_binded = INT_SLP_SETTING_DEFAULT_MEM_FM_RADIO;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_rdo is NULL");
+       }
+
+
+       /* 6 DVB-H */
+       ad->data_dvb_h = setting_create_Gendial_exp_parent_field(scroller, &(ad->itc_2text_3_parent),
+                                                   NULL, NULL, SWALLOW_Type_INVALID,
+                                                   DVB_H_STR,
+                                                   __setting_storage_default_storage_desc_get(INT_SLP_SETTING_DEFAULT_MEM_DVB_H));
+       if (ad->data_dvb_h) {
+               ad->data_dvb_h->int_slp_setting_binded = INT_SLP_SETTING_DEFAULT_MEM_DVB_H;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_shr is NULL");
+       }
+
+       item = elm_genlist_item_append(scroller, &itc_bottom_seperator, NULL, NULL,
+                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
+       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+       int ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_STATUS,
+                       __setting_storage_default_storage_vconf_change_cb, ad);
+       if (ret != 0) {
+               SETTING_TRACE_ERROR("call vconf_notify_key_changed failed");
+       }
+
+       setting_view_storage_default_storage.is_create = 1;
+       return SETTING_RETURN_SUCCESS;
+}
+
+static int setting_storage_default_storage_destroy(void *cb)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retvm_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER, "cb is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) cb;
+
+       int ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_MMC_STATUS,
+                       __setting_storage_default_storage_vconf_change_cb);
+       if (ret != 0) {
+               SETTING_TRACE_ERROR("call vconf_ignore_key_changed failed");
+       }
+
+       elm_naviframe_item_pop(ad->navibar);
+       setting_view_storage_default_storage.is_create = 0;
+       return SETTING_RETURN_SUCCESS;
+}
+
+static int setting_storage_default_storage_update(void *cb)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retvm_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER, "cb is NULL");
+       return SETTING_RETURN_SUCCESS;
+}
+
+static char* __setting_storage_default_storage_desc_get(setting_int_slp_list slp_key)
+{
+       //SETTING_TRACE_BEGIN;
+       const char* setting_default_storage_type[SETTING_DEF_MEMORY_MAX] = {
+               _("IDS_COM_BODY_PHONE"),
+               _("IDS_COM_BODY_MEMORY_CARD")
+       };
+       int ret = 0;
+       int value = 0;
+       int err = -1;
+
+        int mmc_mode = VCONFKEY_SYSMAN_MMC_REMOVED;
+        ret = vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &mmc_mode);
+        setting_retvm_if(ret != 0, NULL, "Get vconf failed");
+
+        /* if mmc card is not mounted, set vconf by 0(phone) */
+        if (mmc_mode == VCONFKEY_SYSMAN_MMC_REMOVED ||
+                mmc_mode == VCONFKEY_SYSMAN_MMC_INSERTED_NOT_MOUNTED) {
+                ret = setting_set_int_slp_key(slp_key, 0, &err);
+                setting_retvm_if(ret != 0, NULL, "Set vconf failed");
+        }
+
+       ret = setting_get_int_slp_key(slp_key, &value, &err);
+
+       switch (slp_key) {
+       case INT_SLP_SETTING_DEFAULT_MEM_WAP:
+       case INT_SLP_SETTING_DEFAULT_MEM_BLUETOOTH:
+       case INT_SLP_SETTING_DEFAULT_MEM_CAMERA:
+       case INT_SLP_SETTING_DEFAULT_MEM_VOICE_RECORDER:
+       case INT_SLP_SETTING_DEFAULT_MEM_FM_RADIO:
+       case INT_SLP_SETTING_DEFAULT_MEM_ALL_SHARE:
+       case INT_SLP_SETTING_DEFAULT_MEM_ADOBE_AIR:
+       case INT_SLP_SETTING_DEFAULT_MEM_DVB_H:
+               {
+                       if (ret == SETTING_RETURN_FAIL
+                           || value >= SETTING_DEF_MEMORY_MAX)
+                               value = SETTING_DEF_MEMORY_PHONE;
+                       return (char *)setting_default_storage_type[value];
+               }
+               break;
+
+       default:
+               ret = SETTING_GENERAL_ERR_NOT_FIND_VALUE_SWITCH;
+               break;
+       }
+
+       return NULL;
+}
+
+static int setting_storage_default_storage_cleanup(void *cb)
+{
+       SETTING_TRACE_BEGIN;
+       return setting_storage_default_storage_destroy(cb);
+}
+
+static void __setting_storage_default_storage_cancel_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "data is NULL");
+
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+       setting_view_change(&setting_view_storage_default_storage,
+                           &setting_view_storage_main, ad);
+}
+
+static void __setting_storage_default_storage_vconf_change_cb(keynode_t *key, void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(NULL == key, "key is NULL");
+       setting_retm_if(NULL == data, "data is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *)data;
+       int status = vconf_keynode_get_int(key);
+       char *vconf_name = vconf_keynode_get_name(key);
+
+       if (!safeStrCmp(vconf_name, VCONFKEY_SYSMAN_MMC_STATUS)) {
+               SETTING_TRACE("status:%d", status);
+               if (VCONFKEY_SYSMAN_MMC_MOUNTED == status) {
+                       __setting_storage_default_storage_update_item_status(ad, EINA_FALSE);
+               } else {
+                       __setting_storage_default_storage_update_item_status(ad, EINA_TRUE);
+               }
+       }
+}
+
+static void __setting_storage_default_storage_update_item_status(void *data, Eina_Bool disable_mmc_flag)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(NULL == data, "data is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *)data;
+
+       setting_retm_if(NULL == ad->data_wap, "ad->data_wap is NULL");
+       setting_retm_if(NULL == ad->data_wap->item, "ad->data_wap->item is NULL");
+       setting_retm_if(NULL == ad->data_bt, "ad->data_bt is NULL");
+       setting_retm_if(NULL == ad->data_cmr, "ad->data_cmr is NULL");
+       setting_retm_if(NULL == ad->data_vrec, "ad->data_vrec is NULL");
+       setting_retm_if(NULL == ad->data_rdo, "ad->data_rdo is NULL");
+       setting_retm_if(NULL == ad->data_dvb_h, "ad->data_dvb_h is NULL");
+
+       /* first item is data_wap */
+       Elm_Object_Item *list_item = ad->data_wap->item;
+       Setting_GenGroupItem_Data *data_sub_item = NULL;
+       while (list_item != NULL) {
+               data_sub_item = (Setting_GenGroupItem_Data *)elm_object_item_data_get(list_item);
+
+               if (data_sub_item == NULL) {
+                       /* data_sub_item is seperator*/
+                       list_item = elm_genlist_item_next_get(list_item);
+                       continue;
+               }
+               SETTING_TRACE("keystr = %s", data_sub_item->keyStr);
+               /* disable_mmc_flag is true, means mmc is not mounted*/
+               if (disable_mmc_flag) {
+                       if (!safeStrCmp(data_sub_item->keyStr, "IDS_COM_BODY_PHONE") &&
+                               ! elm_genlist_item_selected_get(list_item)) {
+                               elm_genlist_item_selected_set(list_item, 1);
+                       } else if (!safeStrCmp(data_sub_item->keyStr, "IDS_COM_BODY_MEMORY_CARD")) {
+                               elm_genlist_item_selected_set(list_item, 0);
+                               setting_disable_genlist_item(list_item);
+                       }
+               } else {
+                       if (!safeStrCmp(data_sub_item->keyStr, "IDS_COM_BODY_MEMORY_CARD") &&
+                               elm_object_item_disabled_get(list_item)) {
+                               setting_enable_genlist_item(list_item);
+                       }
+               }
+               list_item = elm_genlist_item_next_get(list_item);
+       }
+
+       /* if mmc is not mounted, update vconf*/
+       if (disable_mmc_flag) {
+               __setting_storage_default_storage_update_vconf(ad->data_wap);
+               __setting_storage_default_storage_update_vconf(ad->data_bt);
+               __setting_storage_default_storage_update_vconf(ad->data_cmr);
+               __setting_storage_default_storage_update_vconf(ad->data_vrec);
+               __setting_storage_default_storage_update_vconf(ad->data_rdo);
+               __setting_storage_default_storage_update_vconf(ad->data_dvb_h);
+       }
+}
+
+static void __setting_storage_default_storage_update_vconf(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(NULL == data, "data is NULL");
+       Setting_GenGroupItem_Data *data_item = (Setting_GenGroupItem_Data *)data;
+       int err = 0;
+       int value = 0;
+       int ret = 0;
+
+       ret = setting_get_int_slp_key(data_item->int_slp_setting_binded, &value, &err);
+       setting_retm_if(0 != ret, "get vconf failed");
+
+       /* if mmc card is not mounted, set vconf to 0(phone) */
+       if (value != 0) {
+               ret = setting_set_int_slp_key(data_item->int_slp_setting_binded, 0, &err);
+               setting_retm_if(ret != 0, "Set vconf failed");
+
+               G_FREE(data_item->sub_desc);
+               data_item->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_PHONE"));
+               elm_object_item_data_set(data_item->item, data_item);
+               elm_genlist_item_update(data_item->item);
+       }
+}
index e32e921..14ffcaf 100755 (executable)
@@ -26,6 +26,7 @@
 #include <dirent.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+#include <sysman.h>
 
 static int setting_storage_main_create(void *cb);
 static int setting_storage_main_destroy(void *cb);
@@ -42,31 +43,6 @@ setting_view setting_view_storage_main = {
        .cleanup = setting_storage_main_cleanup,
 };
 
-#define SETTING_STORAGE_INTERNAL_STORAGE_STR "Internal storage"
-#define SETTING_STORAGE_PICS_STR "IDS_ST_BODY_PICTURES_VIDEOS"
-#define SETTING_STORAGE_DOWNS_STR "IDS_ST_BODY_DOWNLOADS"
-#define SETTING_STORAGE_MISCES_STR "IDS_ST_BODY_MISCELLANEOUS_FILES"
-#define SETTING_STORAGE_AVAIL_STR "IDS_ST_BODY_AVAILABLE"
-#define SETTING_STORAGE_FORMAT_STR "IDS_ST_BODY_FORMAT_USB_STORAGE"
-#define SETTING_STORAGE_FORMAT_DESC_STR "IDS_ST_BODY_ERASES_ALL_DATA_IN_USB_STORAGE_ABB"
-#define SETTING_STORAGE_MOUNT_STR "IDS_ST_BODY_MOUNT_SD_CARD"
-#define SETTING_STORAGE_INSERT_STR "IDS_ST_BODY_INSERT_SD_CARD"
-
-#define SETTING_STORAGE_APPS_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_applications.png"
-#define SETTING_STORAGE_PICS_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_pictures.png"
-#define SETTING_STORAGE_DOWNS_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_downloads.png"
-#define SETTING_STORAGE_MISCES_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_miscellaneous_files.png"
-#define SETTING_STORAGE_AVAIL_ICON_PATH SETTING_ICON_PATH"/A01-1_icon_color_available.png"
-
-#define SETTING_STORAGE_ICON_WIDTH ((int)640 * WIDGET_SCALE_FACTOR)
-#define SETTING_STORAGE_ICON_HEIGHT ((int)16 * WIDGET_SCALE_FACTOR)
-
-#define SETTING_STORAGE_OPT_PATH               "/opt"
-#define SETTING_STORAGE_MEDIA_PATH             "/opt/media"
-#define SETTING_STORAGE_PICTURES_PATH          "/opt/media/Images"
-#define SETTING_STORAGE_VIDEOS_PATH            "/opt/media/Videos"
-#define SETTING_STORAGE_DOWNLOADS_PATH         "/opt/media/Downloads"
-
 static char *__gl_text_get(void *data, Evas_Object *obj, const char *part)
 {
        retv_if(!data, NULL);
@@ -552,11 +528,506 @@ static void __setting_storage_main_Gendial_mouse_up_cb(void *data, Evas_Object *
 
        if (!safeStrCmp("IDS_ST_BODY_APPLICATIONS", list_item->keyStr)) {
                __setting_storage_main_launch_manage_app_ug(ad);
+       } else if (!safeStrCmp(SETTING_STORAGE_DEFAULT_STORAGE_STR, list_item->keyStr)) {
+               setting_view_change(&setting_view_storage_main,
+                                   &setting_view_storage_default_storage, ad);
        } else {
                // do nothing now
        }
 }
 
+static int __setting_storage_main_check_mmc_status()
+{
+       int ret = 0;
+       struct stat parent_stat, mount_stat;
+
+       ret = stat(SETTING_STORAGE_MMC_PATH, &mount_stat);
+       setting_retvm_if(ret != 0, -1, "get stat error : /opt/storage/sdcard");
+
+       ret = stat(SETTING_STORAGE_MMC_PARENT_PATH, &parent_stat);
+       setting_retvm_if(ret != 0, -1, "get stat error : /opt/storage/sdcard/..");
+
+       /* Does not mounted, same st_dev */
+       if(mount_stat.st_dev == parent_stat.st_dev) {
+               return 0;
+       } else {        /* MMC mounted, diff st_dev */
+               return 1;
+       }
+}
+
+static void __setting_storage_main_sd_card_info_get(char* szTotal, char* szAvail)
+{
+       int mmc_status = __setting_storage_main_check_mmc_status();
+       setting_retm_if(mmc_status == -1, "check mmc status failed");
+
+       /* Does not mounted, same st_dev */
+       if (mmc_status == 0) {
+               snprintf(szTotal, SETTING_STORAGE_MAX_STR_LEN, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
+               snprintf(szAvail, SETTING_STORAGE_MAX_STR_LEN, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
+       }
+       /*  MMC mounted, diff st_dev */
+       else {
+               double dTotal = 0.0;
+               double dAvail = 0.0;
+
+               int ret = SETTING_RETURN_SUCCESS;
+               ret = __setting_storage_main_fs_stat(&dTotal, &dAvail, SETTING_STORAGE_MMC_PATH);
+               setting_retm_if(ret == SETTING_RETURN_FAIL, "get sd card size detail failed");
+
+               ret = __setting_storage_status_size_transition(dTotal, szTotal);
+               setting_retm_if(ret == SETTING_RETURN_FAIL, "__setting_storage_status_size_transition failed");
+
+               ret = __setting_storage_status_size_transition(dAvail, szAvail);
+               setting_retm_if(ret == SETTING_RETURN_FAIL, "__setting_storage_status_size_transition failed");
+
+               SETTING_TRACE("Total[%s], Avail[%s]", szTotal, szAvail);
+       }
+}
+
+static int __setting_storage_main_mmc_content_init(void *data, setting_storage_mmc_cb cb)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retvm_if(NULL == data, SETTING_RETURN_FAIL, "data is NULL");
+       setting_retvm_if(NULL == cb, SETTING_RETURN_FAIL, "cb is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *)data;
+       if (ad->mmc_content == NULL) {
+               ad->mmc_content = (struct mmc_contents *)calloc(1, sizeof(struct mmc_contents *));
+               if (ad->mmc_content == NULL ) {
+                       SETTING_TRACE_ERROR("calloc failed");
+                       return SETTING_RETURN_FAIL;
+               }
+       }
+       ad->mmc_content->mmc_cb = cb;
+       ad->mmc_content->user_data = ad;
+       return SETTING_RETURN_SUCCESS;
+}
+
+static void __setting_storage_status_sd_card_popup_format_response_cb(void *data,
+                                                        Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *)data;
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+
+       char sd_total[SETTING_STORAGE_MAX_STR_LEN] = { 0, };
+       char sd_available[SETTING_STORAGE_MAX_STR_LEN] = { 0, };
+       __setting_storage_main_sd_card_info_get(sd_total, sd_available);
+
+       if (ad->sd_total) {
+               G_FREE(ad->sd_total->sub_desc);
+               ad->sd_total->sub_desc = (char *)g_strdup(sd_total);
+               elm_object_item_data_set(ad->sd_total->item, ad->sd_total);
+               elm_genlist_item_update(ad->sd_total->item);
+       }
+       if (ad->sd_available) {
+               G_FREE(ad->sd_available->sub_desc);
+               ad->sd_available->sub_desc = (char *)g_strdup(sd_available);
+               elm_object_item_data_set(ad->sd_available->item, ad->sd_available);
+               elm_genlist_item_update(ad->sd_available->item);
+       }
+}
+
+static void __setting_storage_status_sd_card_popup_response_cb(void *data,
+                                                        Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *)data;
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+}
+
+static void __setting_storage_main_sd_card_mount_cb(int val, void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+
+       char *desc = NULL;
+       if (val == SETTING_STORAGE_SYSMAN_REQUEST_SUCCESS) {
+               /* do nothing */
+               SETTING_TRACE("mount success");
+               return;
+       } else if (val == SETTING_STORAGE_SYSMAN_REQUEST_MOUNT_ALREADY) {
+               desc = _(SETTING_STORAGE_SD_CARD_MOUNT_ALREADY_DESC);
+       } else {
+               desc = _("IDS_COM_POP_FAILED");
+       }
+
+       ad->popup = setting_create_popup_without_btn(ad, ad->win_get, NULL, desc,
+                                __setting_storage_status_sd_card_popup_response_cb,
+                                SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+}
+
+static void __setting_storage_main_sd_card_unmount_cb(int val, void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+
+       if (val == SETTING_STORAGE_SYSMAN_REQUEST_SUCCESS) {
+               /* do nothing */
+               SETTING_TRACE("unmount success");
+               return;
+       } else {
+               ad->popup = setting_create_popup_without_btn(ad, ad->win_get, NULL, _("IDS_COM_POP_FAILED"),
+                                        __setting_storage_status_sd_card_popup_response_cb,
+                                        SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+       }
+}
+
+static void __setting_storage_main_sd_card_mount_unmount(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *)data;
+
+       int mmc_status = __setting_storage_main_check_mmc_status();
+       setting_retm_if(mmc_status == -1, "check mmc status failed");
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+
+       /* Show progressbar popup */
+       ad->popup = setting_create_popup_with_progressbar(ad, ad->win_get,
+                                                "pending_list", NULL, NULL,
+                                                __setting_storage_status_sd_card_popup_response_cb,
+                                                SETTING_STORAGE_PROGRESSBAR_TIMEOUT, TRUE, TRUE);
+
+       int ret = -1;
+       /* Does not mounted, same st_dev */
+       if (mmc_status == 0) {
+               ret = __setting_storage_main_mmc_content_init(ad, __setting_storage_main_sd_card_mount_cb);
+               if (ret == SETTING_RETURN_FAIL) {
+                       SETTING_TRACE_ERROR("__setting_storage_main_mmc_content_init fail");
+                       if (ad->popup) {
+                               evas_object_del(ad->popup);
+                               ad->popup = NULL;
+                       }
+                       ad->popup = setting_create_popup_without_btn(ad, ad->win_get,
+                                                NULL, _("IDS_COM_POP_FAILED"),
+                                                __setting_storage_status_sd_card_popup_response_cb,
+                                                SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+                       return;
+               }
+               ret = sysman_request_mount_mmc(ad->mmc_content);
+               if (ret == -1) {
+                       SETTING_TRACE_ERROR("fail to call sysman_request_mount_mmc");
+               }
+       }
+       /*  MMC mounted, diff st_dev */
+       else {
+               ret = __setting_storage_main_mmc_content_init(ad, __setting_storage_main_sd_card_unmount_cb);
+               if (ret == SETTING_RETURN_FAIL) {
+                       SETTING_TRACE_ERROR("__setting_storage_main_sd_card_unmount_cb fail");
+                       if (ad->popup) {
+                               evas_object_del(ad->popup);
+                               ad->popup = NULL;
+                       }
+                       ad->popup = setting_create_popup_without_btn(ad, ad->win_get,
+                                                NULL, _("IDS_COM_POP_FAILED"),
+                                                __setting_storage_status_sd_card_popup_response_cb,
+                                                SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+                       return;
+               }
+
+               ret = sysman_request_unmount_mmc(ad->mmc_content,
+                                                MNT_FORCE);    /*  1 = MNT_FORCE */
+               if (ret == -1) {
+                       SETTING_TRACE_ERROR("fail to call sysman_request_unmount_mmc");
+               }
+       }
+
+       /*  if fail, popup failed info */
+       if (ret == -1) {
+               if (ad->popup) {
+                       evas_object_del(ad->popup);
+                       ad->popup = NULL;
+               }
+               ad->popup = setting_create_popup_without_btn(ad, ad->win_get,
+                                                NULL, _("IDS_COM_POP_FAILED"),
+                                                __setting_storage_status_sd_card_popup_response_cb,
+                                                SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+       }
+}
+
+
+static void __setting_storage_main_sd_card_format_cb(int val, void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+
+       if (val == SETTING_STORAGE_SYSMAN_REQUEST_SUCCESS) {
+               ad->popup = setting_create_popup_without_btn(ad, ad->win_get, NULL, _("IDS_COM_POP_SUCCESS"),
+                                        __setting_storage_status_sd_card_popup_format_response_cb,
+                                        SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+
+       } else {
+               ad->popup = setting_create_popup_without_btn(ad, ad->win_get, NULL, _("IDS_COM_POP_FAILED"),
+                                        __setting_storage_status_sd_card_popup_response_cb,
+                                        SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+       }
+}
+
+static void __setting_storage_main_sd_card_format_popup_yes(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+
+       /* Show Formatting..... popup */
+       ad->popup = setting_create_popup_with_progressbar(ad, ad->win_get,
+                                                "list_process", _("IDS_ST_POP_MSG_FORMATTING"),
+                                                NULL, __setting_storage_status_sd_card_popup_response_cb,
+                                                SETTING_STORAGE_PROGRESSBAR_TIMEOUT, TRUE, TRUE);
+
+       int ret = __setting_storage_main_mmc_content_init(ad, __setting_storage_main_sd_card_format_cb);
+       if (ret == SETTING_RETURN_FAIL) {
+               SETTING_TRACE_ERROR("__setting_storage_main_mmc_content_init fail");
+               if (ad->popup) {
+                       evas_object_del(ad->popup);
+                       ad->popup = NULL;
+               }
+               ad->popup = setting_create_popup_without_btn(ad, ad->win_get,
+                                                NULL, _("IDS_COM_POP_FAILED"),
+                                                __setting_storage_status_sd_card_popup_response_cb,
+                                                SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+               return;
+       }
+
+       ret = sysman_request_format_mmc(ad->mmc_content);
+       /*  if fail, destory popup */
+       if (ret == -1) {
+               SETTING_TRACE_ERROR("fail to call sysman_request_format_mmc");
+               if (ad->popup) {
+                       evas_object_del(ad->popup);
+                       ad->popup = NULL;
+               }
+               ad->popup = setting_create_popup_without_btn(ad, ad->win_get,
+                                                NULL, _("IDS_COM_POP_FAILED"),
+                                                __setting_storage_status_sd_card_popup_response_cb,
+                                                SETTING_STORAGE_POPUP_TIMER, FALSE, FALSE);
+       }
+}
+
+static void __setting_storage_main_sd_card_format_popup_no(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+}
+
+static void __setting_storage_main_sd_card_ask_format_resp_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       int response_type = btn_type(obj);
+       if (POPUP_RESPONSE_OK == response_type) {
+               __setting_storage_main_sd_card_format_popup_yes(data);
+       } else if (POPUP_RESPONSE_CANCEL == response_type) {
+               __setting_storage_main_sd_card_format_popup_no(data);
+       }
+}
+
+static void __setting_storage_main_sd_card_format_popup_create(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+
+       if (ad->popup) {
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
+       }
+
+       ad->popup = setting_create_popup_with_btn(ad, ad->win_get, NULL,
+                                        _(SETTING_STORAGE_FORMAT_ASK_MSG),
+                                        __setting_storage_main_sd_card_ask_format_resp_cb, 0,
+                                        2, _("IDS_COM_SK_YES"),_("IDS_COM_SK_NO"));
+}
+
+static void __setting_storage_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
+                                              void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       setting_retm_if(event_info == NULL, "Invalid argument: event info is NULL");
+
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+       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);
+
+       SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
+       if (list_item == ad->sd_mount) {
+               __setting_storage_main_sd_card_mount_unmount(ad);
+       } else if (list_item == ad->sd_format) {
+               __setting_storage_main_sd_card_format_popup_create(ad);
+       }
+}
+
+static void __setting_storage_main_sd_card_info_append(void* data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(data == NULL, "Data parameter is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *) data;
+
+       /* remove the sd info items */
+       if (ad->sd_mount) {
+               elm_object_item_del(ad->sd_mount->item);
+               ad->sd_mount = NULL;
+       }
+       if (ad->sd_total) {
+               elm_object_item_del(ad->sd_total->item);
+               ad->sd_total = NULL;
+       }
+       if (ad->sd_available) {
+               elm_object_item_del(ad->sd_available->item);
+               ad->sd_available = NULL;
+       }
+       if (ad->sd_format) {
+               elm_object_item_del(ad->sd_format->item);
+               ad->sd_format = NULL;
+       }
+
+       int mmc_mode = VCONFKEY_SYSMAN_MMC_REMOVED;
+       int ret = vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &mmc_mode);
+       setting_retm_if(ret != 0, "Get vconf failed");
+
+       if (mmc_mode == VCONFKEY_SYSMAN_MMC_REMOVED) {
+               ad->sd_mount = setting_create_Gendial_field_def(ad->genlist, &(ad->itc_2text_2), NULL,
+                                            ad, SWALLOW_Type_INVALID, NULL,
+                                            NULL, 0, SETTING_STORAGE_MOUNT_STR,
+                                            _(SETTING_STORAGE_INSERT_STR),
+                                            NULL);
+               if (ad->sd_mount) {
+                       setting_disable_genlist_item(ad->sd_mount->item);
+               }
+       } else if (mmc_mode == VCONFKEY_SYSMAN_MMC_INSERTED_NOT_MOUNTED) {
+               ad->sd_mount = setting_create_Gendial_field_def(ad->genlist, &(ad->itc_2text_2),
+                                            __setting_storage_main_mouse_up_Gendial_list_cb,
+                                            ad, SWALLOW_Type_INVALID, NULL,
+                                            NULL, 0, SETTING_STORAGE_MOUNT_STR,
+                                            _(SETTING_STORAGE_INSERT_STR),
+                                            NULL);
+       } else if (mmc_mode == VCONFKEY_SYSMAN_MMC_MOUNTED) {
+               char sd_total[SETTING_STORAGE_MAX_STR_LEN] = { 0, };
+               char sd_available[SETTING_STORAGE_MAX_STR_LEN] = { 0, };
+               __setting_storage_main_sd_card_info_get(sd_total, sd_available);
+
+               ad->sd_total = setting_create_Gendial_field_def(ad->genlist, &(ad->itc_2text_2), NULL,
+                                                    ad, SWALLOW_Type_INVALID, NULL,
+                                                    NULL, 0, "IDS_ST_BODY_TOTAL_SPACE",
+                                                    sd_total,
+                                                    NULL);
+               if (ad->sd_total) {
+                       ad->sd_total->userdata = ad;
+                       elm_genlist_item_select_mode_set(ad->sd_total->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+               } else {
+                       SETTING_TRACE_ERROR("ad->sd_total is NULL");
+               }
+
+               ad->sd_available = setting_create_Gendial_field_def(ad->genlist, &(ad->itc_2text_2), NULL,
+                                                    ad, SWALLOW_Type_INVALID, NULL,
+                                                    NULL, 0, "IDS_ST_BODY_AVAILABLE_SPACE",
+                                                    sd_available,
+                                                    NULL);
+               if (ad->sd_available) {
+                       ad->sd_available->userdata = ad;
+                       elm_genlist_item_select_mode_set(ad->sd_available->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+               } else {
+                       SETTING_TRACE_ERROR("ad->sd_available is NULL");
+               }
+
+               ad->sd_mount = setting_create_Gendial_field_def(ad->genlist, &(ad->itc_1text),
+                                                    __setting_storage_main_mouse_up_Gendial_list_cb,
+                                                    ad, SWALLOW_Type_INVALID, NULL,
+                                                    NULL, 0, "IDS_ST_BODY_UNMOUNT_SD_CARD", NULL,
+                                                    NULL);
+               if (ad->sd_mount) {
+                       ad->sd_mount->userdata = ad;
+               } else {
+                       SETTING_TRACE_ERROR("ad->sd_mount is NULL");
+               }
+
+               ad->sd_format = setting_create_Gendial_field_def(ad->genlist, &(ad->itc_1text),
+                                                    __setting_storage_main_mouse_up_Gendial_list_cb,
+                                                    ad, SWALLOW_Type_INVALID, NULL,
+                                                    NULL, 0,
+                                                    "IDS_ST_BODY_FORMAT_SD_CARD",
+                                                    NULL, NULL);
+               if (ad->sd_format) {
+                       ad->sd_format->userdata = ad;
+               } else {
+                       SETTING_TRACE_ERROR("ad->sd_format is NULL");
+               }
+       } else {
+               SETTING_TRACE_ERROR("error status of sd card");
+       }
+
+       Elm_Object_Item *item = NULL;
+       item = elm_genlist_item_append(ad->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);
+}
+
+static void __setting_storage_vconf_change_cb(keynode_t *key, void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(NULL == key, "key is NULL");
+       setting_retm_if(NULL == data, "data is NULL");
+       SettingStorageUG *ad = (SettingStorageUG *)data;
+       int status = vconf_keynode_get_int(key);
+       char *vconf_name = vconf_keynode_get_name(key);
+
+       if (!safeStrCmp(vconf_name, VCONFKEY_SYSMAN_MMC_STATUS)) {
+               SETTING_TRACE("status:%d", status);
+               /* remove last item -> seperator */
+               Elm_Object_Item *last_item = NULL;
+               last_item = elm_genlist_last_item_get(ad->genlist);
+               if (last_item) {
+                       elm_object_item_del(last_item);
+               }
+               __setting_storage_main_sd_card_info_append(ad);
+       }
+}
+
 /* ***************************************************
  *
  *basic func
@@ -585,10 +1056,6 @@ static int setting_storage_main_create(void *cb)
                                                   NULL,
                                                   ad, &ad->genlist, &ad->navibar);
 
-       setting_create_Gendial_field_titleItem(ad->genlist, &(ad->itc_group_item),
-                                              SETTING_STORAGE_INTERNAL_STORAGE_STR,
-                                              NULL);
-
        ad->itc_2text_1icon_4.item_style = "dialogue/2text.1icon.4";
        ad->itc_2text_1icon_4.func.text_get = __gl_text_get;
        ad->itc_2text_1icon_4.func.content_get = __gl_content_get;
@@ -601,6 +1068,25 @@ static int setting_storage_main_create(void *cb)
 
        __setting_storage_main_downloads_status_get(ad);
 
+       Elm_Object_Item *item = NULL;
+
+       if (!isEmulBin()) {
+               item = elm_genlist_item_append(ad->genlist, &itc_seperator, NULL, NULL,
+                                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
+               elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+               /* Default storage */
+               setting_create_Gendial_field_def(ad->genlist, &(ad->itc_1text),
+                                        __setting_storage_main_Gendial_mouse_up_cb,
+                                        ad, SWALLOW_Type_INVALID, NULL, NULL,
+                                        0, SETTING_STORAGE_DEFAULT_STORAGE_STR,
+                                        NULL, NULL);
+       }
+
+       setting_create_Gendial_field_titleItem(ad->genlist, &(ad->itc_group_item),
+                                              SETTING_STORAGE_INTERNAL_STORAGE_STR,
+                                              NULL);
+
        /* Total space */
        char total_desc[SETTING_STORAGE_MAX_STR_LEN + 1] = {0,};
        ret = __setting_storage_status_size_transition(ad->internal_status.dTotal, total_desc);
@@ -722,23 +1208,22 @@ static int setting_storage_main_create(void *cb)
                                                 NULL, NULL, 0, SETTING_STORAGE_FORMAT_DESC_STR, NULL,
                                                 NULL);
 
+               /* SD card info */
                setting_create_Gendial_field_titleItem(ad->genlist, &(ad->itc_group_item),
-                                                      "IDS_ST_BODY_SD_CARD",
-                                                      NULL);
+                                              "IDS_ST_BODY_SD_CARD", NULL);            
+               __setting_storage_main_sd_card_info_append(ad);
 
-               /* Mound SD card */
-               setting_create_Gendial_field_def(ad->genlist, &(ad->itc_2text_2), NULL,
-                                            ad, SWALLOW_Type_INVALID, NULL,
-                                            NULL, 0, SETTING_STORAGE_MOUNT_STR,
-                                            _(SETTING_STORAGE_INSERT_STR),
-                                            NULL);
+               ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_STATUS,
+                               __setting_storage_vconf_change_cb, ad);
+               if (ret != 0) {
+                       SETTING_TRACE_ERROR("call vconf_notify_key_changed failed");
+               }
+       } else {
+               item = elm_genlist_item_append(ad->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);
        }
 
-       Elm_Object_Item *item = NULL;
-       item = elm_genlist_item_append(ad->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);
-
        setting_view_storage_main.is_create = 1;
        return SETTING_RETURN_SUCCESS;
 }
@@ -750,6 +1235,14 @@ static int setting_storage_main_destroy(void *cb)
 
        SettingStorageUG *ad = (SettingStorageUG *) cb;
 
+       if (!isEmulBin()) {
+               int ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_MMC_STATUS,
+                               __setting_storage_vconf_change_cb);
+               if (ret != 0) {
+                       SETTING_TRACE_ERROR("call vconf_ignore_key_changed failed");
+               }
+       }
+
        if (ad->popup) {
                evas_object_del(ad->popup);
                ad->popup = NULL;
index 999f085..df1bdb9 100755 (executable)
@@ -44,6 +44,12 @@ static void *setting_storage_ug_on_create(ui_gadget_h ug, enum ug_mode mode,
 
        setting_retvm_if(storageUG->win_main_layout == NULL, NULL, "cannot get main window ");
 
+       /* register view node table */
+       setting_view_node_table_intialize();
+       setting_view_node_table_register(&setting_view_storage_main, NULL);
+       setting_view_node_table_register(&setting_view_storage_default_storage,
+                                        &setting_view_storage_main);
+
        storageUG->itc_seperator.item_style = "dialogue/separator/21/with_line";
        storageUG->itc_seperator.func.text_get = NULL;
        storageUG->itc_seperator.func.content_get = NULL;
@@ -60,6 +66,7 @@ static void *setting_storage_ug_on_create(ui_gadget_h ug, enum ug_mode mode,
        setting_create_Gendial_itc("dialogue/1text", &(storageUG->itc_1text));
 
        /*  creating a view. */
+       setting_view_node_set_cur_view(&setting_view_storage_main);
        setting_view_create(&setting_view_storage_main, (void *)storageUG);
        evas_object_event_callback_add(storageUG->win_main_layout, EVAS_CALLBACK_RESIZE, setting_storage_ug_cb_resize, storageUG);
        return storageUG->ly_main;
@@ -91,7 +98,9 @@ static void setting_storage_ug_on_destroy(ui_gadget_h ug, service_h service,
        storageUG->ug = ug;
 
        /*  delete the allocated objects. */
+       setting_view_destroy(&setting_view_storage_default_storage, storageUG);
        setting_view_destroy(&setting_view_storage_main, storageUG);
+
        if (NULL != ug_get_layout(storageUG->ug)) {
                evas_object_hide((Evas_Object *) ug_get_layout(storageUG->ug));
                evas_object_del((Evas_Object *) ug_get_layout(storageUG->ug));
@@ -194,5 +203,13 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
 {
        SETTING_TRACE_BEGIN;
        int ret = 0;
+       int value = SETTING_DEF_MEMORY_PHONE;
+       ret += vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_WAP_INT, value);
+       ret += vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_BLUETOOTH_INT, value);
+       ret += vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_CAMERA_INT, value);
+
+       ret += vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_VOICE_RECORDER_INT, value);
+       ret += vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_FM_RADIO_INT, value);
+       ret += vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_DVB_H_INT, value);
        return ret;
 }
index 30d58a3..1dd0a11 100755 (executable)
@@ -410,28 +410,6 @@ static Setting_GenGroupItem_Data * __bluetooth_handler(void* data, char* keyStr,
        return ad->data_bt;
 }
 
-static Setting_GenGroupItem_Data * __mobileap_handler(void* data, char* keyStr, char* icon_path, char* ug_args, Evas_Object *genlist)
-{
-       setting_main_appdata *ad = (setting_main_appdata *)data;
-
-       ad->data_mobileApp = setting_create_Gendial_field_groupitem(genlist,
-                                                  &(ad->itc[GENDIAL_Type_1icon_2text]),
-                                                  NULL,
-                                                  setting_main_click_list_ex_ug_cb,
-                                                  ug_args,
-                                                  SWALLOW_Type_INVALID,
-                                                  icon_path,
-                                                  NULL,
-                                                  0,
-                                                  keyStr,
-                                                  get_Mobile_AP_on_off_str
-                                                  (),
-                                                  NULL);
-       __BACK_POINTER_SET(ad->data_mobileApp);
-
-       return ad->data_mobileApp;
-}
-
 static Setting_GenGroupItem_Data * __allshare_handler(void* data, char* keyStr, char* icon_path, char* ug_args, Evas_Object *genlist)
 {
        setting_main_appdata *ad = (setting_main_appdata *)data;
@@ -517,12 +495,6 @@ static Setting_GenGroupItem_Data * __default_handler(void* data, char* keyStr, c
                         NULL, NULL, 0, SETTING_WIFI_DIRECT_DESC, NULL, NULL);
                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);
-       } else if (!safeStrCmp(KeyStr_KeisOverWifi, keyStr)) {
-               setting_create_Gendial_field_def(genlist, &itc_multiline_text, NULL,
-                        ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
-                        NULL, NULL, 0, SETTING_KIES_VIA_WIFI_DESC, NULL, NULL);
-               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);
        } else {
                /* do nothing */
        }
@@ -542,7 +514,6 @@ enum {
        MAINLIST_ENTRY_FLIGHT_MODE = 0,
        MAINLIST_ENTRY_WIFI,
        MAINLIST_ENTRY_BT,
-       MAINLIST_ENTRY_MOBILEAP,
        MAINLIST_ENTRY_ALLSHARE,
        MAINLIST_ENTRY_NETWORK,
        MAINLIST_ENTRY_NFC,
@@ -554,7 +525,6 @@ static mainlist_entry mainlist_table[] = {
                {KeyStr_FlightMode,     __flightmode_handler},                  // 0 --> NOT UG
                {KeyStr_WiFi,                   __wifi_handler},                                // 1 --> UG
                {KeyStr_Bluetooth,              __bluetooth_handler},                   // 1 --> UG
-               {KeyStr_MobileAP,               __mobileap_handler},                    // 1 --> UG
                {KeyStr_AllShare,               __allshare_handler},                    // NOT UG
                {KeyStr_Network,                __network_handler},                             // 1 --> UG
                {KeyStr_NFC,                    __nfc_handler},                                 // 1 --> UG
@@ -614,21 +584,13 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_
                                        continue; /* hide Flight Mode in Emulator*/
                                } else if (!safeStrCmp(KeyStr_WiFi, keyStr)) {
                                        continue; /* hide WIFI in Emulator*/
-                               } else if (!safeStrCmp(KeyStr_MobileAP, keyStr)) {
-                                       continue; /* hide Tethering in Emulator*/
                                } else if (!safeStrCmp(KeyStr_WiFiDirect, keyStr)) {
                                        continue; /* hide WiFiDirect in Emulator*/
-                               } else if (!safeStrCmp(KeyStr_AllShareCast, keyStr)) {
-                                       continue; /* hide AllShareCast in Emulator*/
-                               } else if (!safeStrCmp(KeyStr_NearbyDevices, keyStr)) {
-                                       continue; /* hide NearbyDevices in Emulator*/
-                               } else if (!safeStrCmp(KeyStr_KeisOverWifi, keyStr)) {
-                                       continue; /* hide KeisOverWifi in Emulator*/
-                               } else if (!safeStrCmp(KeyStr_Synchronise, keyStr)) {
-                                       continue; /* hide Synchronise in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Network, keyStr)) {
                                        continue; /* hide Network in Emulator*/
-                               }else {
+                               } else if (!safeStrCmp(KeyStr_Bluetooth, keyStr)) {
+                                       continue; /* hide Bluetooth in Emulator*/
+                               } else {
                                        /* do nothing */
                                }
                        }
@@ -664,10 +626,6 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_
 
                                mainlist_table[MAINLIST_ENTRY_BT].ui_handler(ad, keyStr, icon_path, ug_args, genlist);
 
-                       } else if (!safeStrCmp(KeyStr_MobileAP, keyStr) && is_ug_installed_by_ug_args(ug_args)) {       /* load special icon */
-
-                               mainlist_table[MAINLIST_ENTRY_MOBILEAP].ui_handler(ad, keyStr, icon_path, ug_args, genlist);
-
                        } else if (!safeStrCmp(KeyStr_Network, keyStr) && is_ug_installed_by_ug_args(ug_args)) {        /* load special UG */
 
                                mainlist_table[MAINLIST_ENTRY_NETWORK].ui_handler(ad, keyStr, icon_path, ug_args, genlist);
@@ -778,22 +736,16 @@ void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object
                        //SETTING_TRACE("KeyString :  %s , tmpPos : %d , inputPos : %d ", keyStr, tmpPos, inputPos );
 
                        if (is_emulator) {
-                               if (!safeStrCmp(KeyStr_EventsNotifications, keyStr)) {
-                                       continue; /* hide EventsNotifications in Emulator*/
-                               } else if (!safeStrCmp(KeyStr_Security, keyStr)) {
+                               if (!safeStrCmp(KeyStr_Security, keyStr)) {
                                        continue; /* hide Security in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Motions, keyStr)) {
                                        continue; /* hide Motion in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Accessibility, keyStr)) {
                                        continue; /* hide Accessibility in Emulator*/
-                               } else if (!safeStrCmp(KeyStr_VoiceInOut, keyStr)) {
-                                       continue; /* hide VoiceInOut in Emulator*/
-                               } else if (!safeStrCmp(keystr_Drivingmode, keyStr)) {
-                                       continue; /* hide Drivingmode in Emulator*/
-                               } else if (!safeStrCmp(KeyStr_License, keyStr)) {
-                                       continue; /* hide License in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Memory, keyStr)) {
                                        continue; /* hide Memory in Emulator*/
+                               } else if (!safeStrCmp(KeyStr_Powersaving, keyStr)) {
+                                       continue; /* hide Powersaving in Emulator*/
                                } else {
                                        /* do nothing */
                                }
@@ -1962,10 +1914,6 @@ void setting_update_gl_item(void* data)
                                item_to_update = ad->data_nfc;
                                bGlUpdate = EINA_TRUE;
                                break;
-                       case GL_ITEM_MAP:
-                               item_to_update = ad->data_mobileApp;
-                               bGlUpdate = EINA_TRUE;
-                               break;
                        case GL_ITEM_FLIGHT:
                                item_to_update = ad->data_flight;
                                bGlUpdate = EINA_FALSE;
@@ -2119,40 +2067,6 @@ setting_main_click_list_default_ug_cb(void *data, Evas_Object *obj,
                                          NO_UG_FOUND_MSG);
 }
 
-void
-setting_main_click_list_usb_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
-
-       int err;
-       int value = -1;
-       char *str_text = USB_NEED_OFF;
-
-       Elm_Object_Item *item = (Elm_Object_Item *) event_info;
-
-       setting_get_int_slp_key(INT_SLP_SETTING_MOBILE_AP_STATUS, &value, &err);
-       if (err != 0)
-       {
-               SETTING_TRACE_ERROR("FAIL: VCONFKEY_MOBILE_HOTSPOT_MODE may not exist\n");
-               setting_main_click_list_ex_ug_cb(data, obj, item);
-               return;
-       }
-
-       /* If mobile hotspot is on, going USB utilties is blocked by a popup*/
-       if (value & VCONFKEY_MOBILE_HOTSPOT_MODE_USB)
-       {
-               elm_genlist_item_selected_set(item, EINA_FALSE);
-               setting_create_simple_popup(g_main_ad, g_main_ad->win_main, NULL, (str_text));
-       }
-       else
-       {
-               setting_main_click_list_ex_ug_cb(data, obj, item);
-       }
-
-       SETTING_TRACE_END;
-}
-
 void setting_main_click_list_more_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
index 375eb4d..192edcf 100755 (executable)
@@ -318,11 +318,6 @@ static int setting_main_lang_changed_cb(void *data)
                if ( ! str) str = g_strdup("err");
            ad->data_nfc->sub_desc = str;
        }
-       if (ad->data_mobileApp) {
-           str = (char *)g_strdup(get_Mobile_AP_on_off_str());
-               if ( ! str) str = g_strdup("err");
-           ad->data_mobileApp->sub_desc = str;
-       }
        if (ad->data_bright) {
                str = (char*)g_strdup(get_brightness_mode_str());
                if ( ! str) str = g_strdup("err");
@@ -529,23 +524,6 @@ static void setting_int_vconf_change_cb(keynode_t *key, void *data)
                        elm_object_item_data_set(item_to_update->item, item_to_update);
                        elm_genlist_item_update(item_to_update->item);
                }
-       } else if (!safeStrCmp(vconf_name, VCONFKEY_MOBILE_HOTSPOT_MODE)) {
-               item_to_update = ad->data_mobileApp;
-               retm_if(!item_to_update, "ad->data_mobileApp is NULL");
-
-               /* For other vconfs */
-               if (FALSE == status) {
-                       item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_OFF_M_STATUS"));
-               } else {
-                       item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_ON_M_STATUS"));
-               }
-
-               if (ad->bAppPause || ad->ug) {
-                       ad->updateItems[GL_ITEM_MAP] = EINA_TRUE;
-               } else { // app is not in pause without ug
-                       elm_object_item_data_set(item_to_update->item, item_to_update);
-                       elm_genlist_item_update(item_to_update->item);
-               }
        } else if (!safeStrCmp(vconf_name, VCONFKEY_SYSMAN_BATTERY_STATUS_LOW)) {
                if (status <= VCONFKEY_SYSMAN_BAT_CRITICAL_LOW) {
                        if (ad->data_bright) {
@@ -924,7 +902,6 @@ static int setting_main_app_reset(service_h service, void *data)
        cb = setting_int_vconf_change_cb;
        REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_BT_STATUS, cb, data);
        REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_WIFI_STATE, cb, ad);
-       REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_MOBILE_HOTSPOT_MODE, cb, ad);
        REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_SYSMAN_BATTERY_STATUS_LOW, cb, ad);
        REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_SETAPPL_BRIGHTNESS_AUTOMATIC_INT, cb, data);