Cleaning

- unused/unnecessary code removed from main app
- it is no longer necessary to build profile module during development works
- battery module has translations turned on

Change-Id: Icfc2c5395f3d455a3812a1a4f99d47f885a14655
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e08f94696769f7f011d5f767c3383cb0bb9a7b27..bee38b827b950ac6c0158c19ae1b5ab0f0df8e9b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,6 @@ SET(EDJDIR "${RESDIR}/edje")
 SET(IMAGEDIR "${RESDIR}/images")
 SET(CMAKE_SKIP_BUILD_RPATH true)
 
-SET(ABOUTEDJ "${TZ_SYS_RO_APP}/org.tizen.setting-about/res/edje")
-
 #set variable
 SET(SETTING_PROFILE setting-profile)
 SET(SETTING_CONNECTIVITY setting-connectivity)
@@ -86,7 +84,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/src/setting-common-internal.pc.in ${CMAKE_SOU
 # setting plugin
 ADD_SUBDIRECTORY(src)
 
-# all UGs for Setting itself
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ABOUT})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ACCESSIBILITY})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_APPLICATIONS})

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 2f5a7a7b8b18f81a241ee44f4bf34d71f88c2ca4..912053ba95cf4020efeaeab8560bb049772677e5 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -220,11 +220,8 @@ mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/bin/
 
 %defattr(-,root,root,-)
 
-#%{PREFIX}/bin/setting
 %{PREFIX}/bin/*
 %{CONFIGDIR}/*
-%{PREFIX}/bin/setting_conf_util
-%{PREFIX}/bin/setting_volume_popup
 
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so.*

diff --git a/setting-about/CMakeLists.txt b/setting-about/CMakeLists.txt
index 6c0fc7b7206066f25305f88fd295484eaebd913b..338f3559454cecedb60250d308260e9c34a97583 100644 (file)
--- a/setting-about/CMakeLists.txt
+++ b/setting-about/CMakeLists.txt
@@ -62,6 +62,5 @@ ADD_EXECUTABLE(${PROJECT_SETTING_ABOUT}
 TARGET_LINK_LIBRARIES(${PROJECT_SETTING_ABOUT} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
 TARGET_LINK_LIBRARIES(${PROJECT_SETTING_ABOUT} ${pkgs_about_LDFLAGS} -pie)
 
-#INSTALL(PROGRAMS ${PROJECT_SETTING_ABOUT} DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_ABOUT}/bin)
 INSTALL(PROGRAMS ${PROJECT_SETTING_ABOUT} DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/bin)
 

diff --git a/setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c b/setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c
index 4dff4935f31836a4ba820bfcb0ab78bdad08f134..7f60195d74bee4fb7775651b526d63744f70eae8 100755 (executable)
--- a/setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c
+++ b/setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c
@@ -28,6 +28,10 @@ setting_view smartmanager_view_battery_main;
 static Eina_Bool _battery_main_click_softkey_back_cb(
                void *data, Evas_Object *obj,
                void *event_info);
+
+static void _get_battery_usage_time_str(char *buff, size_t buff_len,
+                                       int hours, int minutes);
+
 /*********************************/
 const char *smartmanagerbattery_main_get_charge_status_text()
 {
@@ -169,6 +173,7 @@ static void _battery_usage_details_list(void * data)
 
 static int battery_main_create(void *data)
 {
+       char buff[512] = {0};
        Elm_Object_Item *navi_it;
 //     Evas_Object *back_btn, *toolbar, *more_btn;
        SmartMgrBattery *ad = data;
@@ -242,7 +247,7 @@ static int battery_main_create(void *data)
 
        /* Battery info */
        _battery_info(ad);
-
+       _get_battery_usage_time_str(buff, sizeof(buff), 11, 12);
        setting_create_Gendial_field_titleItem(genlist, &(ad->itc_grp_title),
                        _(BATTERY_STR_USAGE_TITLE), NULL);
        item = setting_create_Gendial_field_def(
@@ -254,7 +259,7 @@ static int battery_main_create(void *data)
                        NULL,
                        NULL,
                        0,
-                       "Battery usage for 2h 15 m.",
+                       buff,
                        NULL,
                        NULL);
        if (item)
@@ -317,3 +322,12 @@ void battery_main_init(SmartMgrBattery *ad)
 
        ad->main_view = &smartmanager_view_battery_main;
 }
+
+static void _get_battery_usage_time_str(char *buff, size_t buff_len,
+                                       int hours, int minutes)
+{
+       const char *txt =
+       _(IDS_SM_BODY_THE_BATTERY_USAGE_FOR_THE_PAST_P1SD_HOURS_P2SD_MINUTES_C);
+
+       snprintf(buff, buff_len, txt, hours, minutes);
+}

diff --git a/setting-smartmanager/smartmanager-battery/src/smartmanager-battery.c b/setting-smartmanager/smartmanager-battery/src/smartmanager-battery.c
index 621cc1156e3249357008b6174546a64ec32ed624..b3d0029750100459ac5c5c60e9884cfc18c5ff50 100644 (file)
--- a/setting-smartmanager/smartmanager-battery/src/smartmanager-battery.c
+++ b/setting-smartmanager/smartmanager-battery/src/smartmanager-battery.c
@@ -119,7 +119,7 @@ static bool _smartmgr_battery_app_create(void *data)
 
        SmartMgrBattery *ad = (SmartMgrBattery *)data;
 
-//     setting_set_i18n("setting", SETTING_LOCALEDIR);
+       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
        if (app_init(&ad->md, SMARTMANAGER_BATTERY_PACKAGE_NAME)
                                                        != SETTING_RETURN_SUCCESS) {
                SETTING_TRACE_ERROR("Cannot initialize application");

diff --git a/src/setting-main.c b/src/setting-main.c
index 9d71ca6ac16699ecfa8fb95932b1c6577b01c9ca..877f606e6277f9d004ef7d6b9a6c0c783cfab241 100644 (file)
--- a/src/setting-main.c
+++ b/src/setting-main.c
@@ -64,10 +64,7 @@ static void __all_gl_group_clicked_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
        SETTING_TRACE_BEGIN;
-       /* error check */
-       /*setting_retm_if(data == NULL, "Data parameter is NULL"); */
-       /* int view_type = (int)data; */
-       /* setting_main_appdata *ad = g_main_ad; */
+
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;
        elm_genlist_item_selected_set(item, 0);
        Setting_GenGroupItem_Data *data_parentItem =
@@ -76,8 +73,6 @@ static void __all_gl_group_clicked_cb(void *data, Evas_Object *obj,
        setting_retm_if(data_parentItem == NULL, "data_parentItem is NULL");
 
        Elm_Object_Item *start_item = NULL;
-       /* Elm_Object_Item *end_item = NULL; */
-       /* Elm_Object_Item *it; */
 
        data_parentItem->isPlaying = !data_parentItem->isPlaying;
        int hide_flag = !(data_parentItem->isPlaying);
@@ -293,12 +288,6 @@ static int setting_main_destroy(void *cb)
                ecore_timer_del(ad->event_freeze_timer);
                ad->event_freeze_timer = NULL;
        }
-       /*evas_object_smart_callback_del(ad->md.main_genlist, "realized",
-        * __gl_realized_cb); */
-
-       elm_object_part_content_unset(ad->md.layout,
-                       "elm.swallow.content");
-       elm_object_item_part_content_unset(ad->md.naviframe_it, "tabbar");
 
        setting_view_main.is_create = 0;
        SETTING_TRACE_END;

diff --git a/src/setting.c b/src/setting.c
index e04365bf587fbb139a0721da686cc7ccfd59c1dd..a4a01c92752279db0d574417d53097b621faac4c 100755 (executable)
--- a/src/setting.c
+++ b/src/setting.c
@@ -37,16 +37,6 @@
 #include <system_settings.h>
 #include <bundle_internal.h>
 
-
-/*#define SUPPORT_UG_MESSAGE */
-
-#define SETTING_SOUND_VOL_MAX 15
-#define SETTING_DEFAULT_RINGTONE_VOL_INT       11
-#define SETTING_DEFAULT_NOTI_VOL_INT           11
-#define SETTING_DEFAULT_MEDIA_VOL_INT          9
-
-int g_geometry_x, g_geometry_y, g_geometry_w, g_geometry_h;
-
 setting_main_appdata *g_main_ad;
 
 void termination_handler(int signum)
@@ -87,42 +77,8 @@ static void _rot_changed_cb(void *data, Evas_Object *obj, void *event_info)
 
        SETTING_TRACE_DEBUG("....change_ang:%d", change_ang);
        SETTING_TRACE_DEBUG("current_rotation:%d", ad->current_rotation);
-       /*Send the rotation event to UGs.. */
-       enum ug_event event = UG_EVENT_ROTATE_PORTRAIT;
-       switch (change_ang) {
-       case APP_DEVICE_ORIENTATION_0:
-               event = UG_EVENT_ROTATE_PORTRAIT;
-               break;
-       case APP_DEVICE_ORIENTATION_180:
-               event = UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN;
-               break;
-       case APP_DEVICE_ORIENTATION_270:
-               event = UG_EVENT_ROTATE_LANDSCAPE;
-               break;
-       case APP_DEVICE_ORIENTATION_90:
-               event = UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN;
-               break;
-       default:
-               return;
-       }
-       SETTING_TRACE_DEBUG("diff:%d", elm_win_rotation_get(ad->md.window)
-                       - ad->current_rotation);
-
-       if (change_ang != ad->current_rotation) {
-               int diff = change_ang - ad->current_rotation;
-               if (diff < 0)
-                       diff = -diff;
-
-               /**
-                * @todo if app didn't launch UG, is the call required to
-                * invoke?
-                */
-               ug_send_event(event);
-               /* if (diff == 180)
-                       do nothing */
-
-               ad->current_rotation = change_ang;
-       }
+
+       ad->current_rotation = change_ang;
 }
 #endif
 
@@ -133,10 +89,6 @@ static void setting_main_region_changed_cb(app_event_info_h event_info,
                void *data)
 {
        retm_if(!data, "Invalid argument: data is NULL");
-       setting_main_appdata *ad = data;
-
-       if (ad->ug)
-               ug_send_event(UG_EVENT_REGION_CHANGE);
 }
 
 /**
@@ -189,8 +141,6 @@ static bool setting_main_app_create(void *data)
                        appcore_measure_time());
        appcore_measure_start();
 
-       /*elm_config_accel_preference_set("3d"); */
-
 #if SUPPORT_DRI
        setenv("EVAS_DRI_SWAPBUF", "1", 1);
 #endif
@@ -216,28 +166,14 @@ static bool setting_main_app_create(void *data)
                        /* no callback */
                        APP_EVENT_DEVICE_ORIENTATION_CHANGED, NULL, NULL);
 
-#if 0
-       app_control_h svc;
-       app_control_create(&svc);
-       /*app_control_create_request(b, &svc); */
-       /*ad->is_searchmode = setting_main_sfinder_handler(svc, ad, NULL); */
-       app_control_destroy(svc);
-       svc = NULL;
-#endif
        /*------------------------------------------------------------------ */
 
        if (app_init(&ad->md, SETTING_PACKAGE) != SETTING_RETURN_SUCCESS)
                return false;
 
-       UG_INIT_EFL(ad->md.window, UG_OPT_INDICATOR_ENABLE);
        ad->current_rotation = elm_win_rotation_get(ad->md.window);
        SETTING_TRACE_DEBUG("ad->current_rotation:%d", ad->current_rotation);
-       if (elm_win_wm_rotation_supported_get(ad->md.window)) {
-               /* rotation value that app may want */
-               int rots[4] = { 0, 90, 180, 270 };
-               elm_win_wm_rotation_available_rotations_set(ad->md.window,
-                               rots, 4);
-       }
+
        evas_object_smart_callback_add(ad->md.window, "wm,rotation,changed",
                        _rot_changed_cb, ad);
 
@@ -316,23 +252,15 @@ static void setting_main_app_terminate(void *data)
        evas_object_smart_callback_del(ad->md.window, "wm,rotation,changed",
                        _rot_changed_cb);
 
-#if 1
        /*PLUGIN_FINI; */
        setting_cfg_exit();
        clear_system_service_data();
 
-       ug_destroy_all();
-       ad->ug = NULL;
-
-#endif
        SETTING_TRACE("*** SETTING APPLICATION CLOSED ***");
        setting_view_destroy(&setting_view_main, ad);
 
-       SETTING_TRACE_DEBUG("!!! After setting_view_destroy");
-       if (ad->md.window) {
-               evas_object_del(ad->md.window);
-               ad->md.window = NULL;
-       }
+       evas_object_del(ad->md.window);
+       ad->md.window = NULL;
 
        SETTING_TRACE_END;
        return;
@@ -344,9 +272,6 @@ static void setting_main_app_terminate(void *data)
 static void setting_main_app_pause(void *data)
 {
        SETTING_TRACE_BEGIN;
-       setting_main_appdata *ad = data;
-       if (ad->ug)
-               ug_pause();
 }
 
 /**
@@ -357,25 +282,8 @@ static void setting_main_app_resume(void *data)
        SETTING_TRACE_BEGIN;
        setting_main_appdata *ad = data;
 
-       _rot_changed_cb(ad, ad->md.window, NULL);/*to fix P131121-02103 */
-
-       if (ad->is_searchmode % 10 == Cfg_Item_AppLauncher_Node) {
-               /* app-launching exit */
+       if (ad->is_searchmode % 10 == Cfg_Item_AppLauncher_Node)
                elm_exit();
-       }
-
-       if (!(ad->isInUGMode && ad->ug)) { /* top-level view is not on UG */
-               SETTING_TRACE("update main genlist in resuming app without UG");
-               Eina_Bool is_freezed = evas_object_freeze_events_get(
-                               ad->md.naviframe);
-               SETTING_TRACE_DEBUG("is_freezed : %d", is_freezed);
-               if (is_freezed)
-                       evas_object_freeze_events_set(ad->md.naviframe,
-                                       EINA_FALSE);
-
-       } else if (ad->ug) {
-               ug_resume();
-       }
 }
 
 /**
@@ -411,7 +319,6 @@ static void setting_main_app_reset(app_control_h service, void *data)
 EXPORT_PUBLIC
 int main(int argc, char *argv[])
 {
-       int r = 0;
        setting_main_appdata ad;
 
        SETTING_TRACE_DEBUG(
@@ -430,8 +337,5 @@ int main(int argc, char *argv[])
        SETTING_TRACE_DEBUG("[TIME] 2. main : %d msec ",
                        appcore_measure_time());
        appcore_measure_start();
-       r = ui_app_main(argc, argv, &ops, &ad);
-       retv_if(r == -1, -1);
-
-       return 0;
+       return ui_app_main(argc, argv, &ops, &ad);
 }