reset: apply ui guide changes

* remove popup appearing after reset confirmation
* set default time to 1st January 2000
* set automatic time update to 'on' on reset

Change-Id: I1d39859ca170cb2c014656b01fdf1b4439520047

diff --git a/setting-reset/CMakeLists.txt b/setting-reset/CMakeLists.txt
index 3e60fc23c8a22a837cf41a1f6c5c93d06cea3036..7c8404b836b0f78eb8e38dbfd4e4138dadb76e15 100644 (file)
--- a/setting-reset/CMakeLists.txt
+++ b/setting-reset/CMakeLists.txt
@@ -12,6 +12,7 @@ pkg_check_modules(pkgs_profile REQUIRED
        dlog
        dbus-1
        vconf
+       alarm-service
 )
 
 FOREACH(flag ${pkgs_profile_CFLAGS})

diff --git a/setting-reset/src/setting-reset-initial-config.c b/setting-reset/src/setting-reset-initial-config.c
index 97a6ee7eec1c027a0b2a296f4f2364bbc3485424..ddf7bc805689d236261bff477cf74ed041f41d0d 100644 (file)
--- a/setting-reset/src/setting-reset-initial-config.c
+++ b/setting-reset/src/setting-reset-initial-config.c
@@ -18,11 +18,12 @@
 #include "setting-reset.h"
 
 #include <app_control.h>
+#include <alarm.h>
 
 #define OOBE_MAIN_APP_ID "org.tizen.oobe"
 #define OOBE_RESET_OPERATION "http://tizen.org/appcontrol/operation/reset"
 
-int setting_reset_initial_config()
+static int setting_reset_initial_oobe_config()
 {
        app_control_h handle = NULL;
        int ret = -1;
@@ -57,3 +58,66 @@ destroy:
        app_control_destroy(handle);
        return ret;
 }
+
+static int setting_reset_initial_time_config_reset_automatic_time_update_flag()
+{
+       int err;
+
+       setting_set_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE,
+               SETTING_ON_OFF_BTN_ON, &err);
+       if (err != 0) {
+               SETTING_TRACE_ERROR("setting_set_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE, SETTING_ON_OFF_BTN_ON, ..) failed: %d", err);
+               return 1;
+       }
+
+       return 0;
+}
+
+static int setting_reset_initial_time_config_reset_systime()
+{
+       int err;
+       struct tm time_after_reset;
+
+       time_after_reset.tm_sec = 0;
+       time_after_reset.tm_min = 0;
+       time_after_reset.tm_hour = 0;
+       time_after_reset.tm_mday = 1;
+       time_after_reset.tm_mon = 0;
+       time_after_reset.tm_year = 100;
+       time_after_reset.tm_isdst = -1;
+       time_after_reset.tm_wday = 6;
+       time_after_reset.tm_yday = 0;
+
+       err = alarmmgr_set_systime(mktime(&time_after_reset));
+       if (err != 0) {
+               SETTING_TRACE_ERROR("alarmmgr_set_systime failed: %d", err);
+               return 1;
+       } else {
+               SETTING_TRACE_DEBUG("alarmmgr_set_systime(%d) success", (int)mktime(&time_after_reset));
+       }
+
+       /* send time changed event */
+       vconf_set_int(VCONFKEY_SYSTEM_TIME_CHANGED, 0);
+
+       return 0;
+}
+
+static int setting_reset_initial_time_config()
+{
+       int err = 0;
+
+       err |= setting_reset_initial_time_config_reset_systime();
+       err |= setting_reset_initial_time_config_reset_automatic_time_update_flag();
+
+       return err;
+}
+
+int setting_reset_initial_config()
+{
+       int ret = 0;
+
+       ret |= setting_reset_initial_time_config();
+       ret |= setting_reset_initial_oobe_config();
+
+       return ret;
+}

diff --git a/setting-reset/src/setting-reset-main.c b/setting-reset/src/setting-reset-main.c
index 04bbac880e0078a1855e5c0596e0a89a4b3efa92..a1c31302748ef8efb32b9fe932296c81ca2072a2 100644 (file)
--- a/setting-reset/src/setting-reset-main.c
+++ b/setting-reset/src/setting-reset-main.c
@@ -145,19 +145,14 @@ static void setting_reset_network_clicked(void *data, Evas_Object *obj, void *ev
 }
 #endif
 
-static void _show_reset_initial_config_result_popup(Evas_Object *parent, bool result)
-{
-       const char *title = _("IDS_ST_BODY_RESET_INITIAL_CONFIGURATION");
-       const char *content = result ? _("IDS_IM_BODY_SUCCESSFULLY_COMPLETED") : _("IDS_IM_POP_UNEXPECTED_ERROR");
-
-       info_popup_show_message(parent, title, content, _("IDS_ST_BUTTON_OK_ABB"));
-}
-
 static void _on_confirmed_reset_initial_config(void *data, Evas_Object *obj, void *event_info)
 {
        int result = setting_reset_initial_config();
+       if (result != 0)
+       {
+               SETTING_TRACE_ERROR("setting_reset_initial_config failed.");
+       }
        evas_object_del(obj);
-       _show_reset_initial_config_result_popup(data, result == 0);
 }
 
 static void setting_reset_initial_config_clicked(void *data, Evas_Object *obj, void *event_info)