[TBT][system-settings][Non-ACR][TSAM-10078,TSAM-10135][Key Time change fixed]

Change-Id: Id54a0e3b6c7f1e3b5a4b8e73cf2f60dd8123cc1b
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>

diff --git a/release/binary-aarch64/org.tizen.tbtcoreapp-1.0.0-aarch64.tpk b/release/binary-aarch64/org.tizen.tbtcoreapp-1.0.0-aarch64.tpk
index cb4d35ed6bce7177c6fa9c641553552051d6b5d3..d4ee197bc2cccece8a700d58ad25f0e289de5f78 100644 (file)
Binary files a/release/binary-aarch64/org.tizen.tbtcoreapp-1.0.0-aarch64.tpk and b/release/binary-aarch64/org.tizen.tbtcoreapp-1.0.0-aarch64.tpk differ

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index ec2353a2d062810f345deec9cdb7f277dfdb5cac..20a38965c504dc5fb52740097fd876253e8be5fc 100644 (file)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk
index 3c46b34133d543464b491e85e5f6fc098b38a4fe..518c998e1dd82808874b5a3d529906877bbff31f 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ

diff --git a/release/binary-x86_64/org.tizen.tbtcoreapp-1.0.0-x86_64.tpk b/release/binary-x86_64/org.tizen.tbtcoreapp-1.0.0-x86_64.tpk
index 0b6d517bf9dd9447db20da16dfc190af74bb8fd0..3224e0464f61c88e00b23edbfdce281da123a576 100644 (file)
Binary files a/release/binary-x86_64/org.tizen.tbtcoreapp-1.0.0-x86_64.tpk and b/release/binary-x86_64/org.tizen.tbtcoreapp-1.0.0-x86_64.tpk differ

diff --git a/tbtcoreapp/src/view/tbt-systemsettings-view.c b/tbtcoreapp/src/view/tbt-systemsettings-view.c
index 9ef858250eea38e5bb7930a9b7577a195ab94843..a77476f08128fcc1fa660ffe018286cec43eccd4 100755 (executable)
--- a/tbtcoreapp/src/view/tbt-systemsettings-view.c
+++ b/tbtcoreapp/src/view/tbt-systemsettings-view.c
@@ -107,6 +107,7 @@ systemsettings_view *systemsettings_view_add(Evas_Object *navi, tbt_info *tbt_in
 {
        RETVM_IF(NULL == navi, NULL, "navi is null");
        int ret, value;
+       int timevalue = 0;
        bool bvalue;
        systemsettings_view *this = NULL;
        this = calloc(1, sizeof(systemsettings_view));
@@ -205,28 +206,24 @@ systemsettings_view *systemsettings_view_add(Evas_Object *navi, tbt_info *tbt_in
                ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_TIME_CHANGED, _system_settings_time_changed_changed_cb, this);
                RETVM_IF(ret != SYSTEM_SETTINGS_ERROR_NONE && ret != SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, NULL, "system_settings_set_changed_cb failed : %s", get_system_settings_error(ret));
 
-               this->create_label = ui_utils_label_add(this->view->layout, "Key Font Size: ");
+               this->create_label = ui_utils_label_add(this->view->layout, "Time Changed Key: ");
                elm_label_line_wrap_set(this->create_label, ELM_WRAP_WORD);
 
-               ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &value);
+               ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &timevalue);
                RETVM_IF(ret != SYSTEM_SETTINGS_ERROR_NONE && ret != SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, NULL, "system_settings_get_value_bool failed: %s",get_system_settings_error(ret));
 
-               DBG("value: %d", bvalue);
+               timevalue = 0;
+               DBG("Time value: %d", timevalue);
 
-               switch(value)
+               switch(timevalue)
                {
                        case 0:
                                ui_utils_label_set_text(this->create_label, "Time unchanged", "left");
                                break;
 
-                       case 1:
-                               ui_utils_label_set_text(this->create_label, "Time changed", "left");
-                               break;
-
                        default:
-                               ui_utils_label_set_text(this->create_label, "System Time Unknown status", "left");
+                               ui_utils_label_set_text(this->create_label, "Time changed", "left");
                                break;
-
                }
        }
 
@@ -587,28 +584,24 @@ void _system_settings_time_changed_changed_cb(system_settings_key_e key, void *u
 {
 
        RETM_IF(NULL == user_data, "user_data is null");
-       int ret, value;
+       int ret;
+       int timevalue = 0;
        systemsettings_view *this = NULL;
-    this = (systemsettings_view*) user_data;
+       this = (systemsettings_view*) user_data;
 
-    ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &value);
-    RETM_IF(ret != SYSTEM_SETTINGS_ERROR_NONE && ret != SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, "system_settings_get_value_int failed: %s",get_system_settings_error(ret));
-
-       switch(value)
+       ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &timevalue);
+       RETM_IF(ret != SYSTEM_SETTINGS_ERROR_NONE && ret != SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, "system_settings_get_value_int failed: %s",get_system_settings_error(ret));
+       DBG("In callback, Time changed value: %d", timevalue);
+       switch(timevalue)
        {
                case 0:
                        ui_utils_label_set_text(this->create_label, "Time unchanged", "left");
                        break;
 
-               case 1:
-                       ui_utils_label_set_text(this->create_label, "Time changed", "left");
-                       break;
-
                default:
-                       ui_utils_label_set_text(this->create_label, "System Time Unknown status", "left");
+                       ui_utils_label_set_text(this->create_label, "Time changed", "left");
                        break;
-
-               }
+       }
 }
 
 /**