[SM][GUI] Unit fixes according to guide.

Change-Id: I26f0ed0cb7782227e176d2f90de62d0e6319e717
Signed-off-by: Pawel Aksiutowicz <p.aksiutowic@partner.samsung.com>

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
index 967f9584a9168f68ea8e3360926aa8b34937660d..c532de2a29deb4bdbb6c7caaefca34c70b08045f 100644 (file)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
@@ -28,9 +28,7 @@ static const char* data_usage_mobile_strings[] = {
 };
 
 typedef enum {
-       DATA_UNIT_TYPE_B = 1,
-       DATA_UNIT_TYPE_KB,
-       DATA_UNIT_TYPE_MB,
+       DATA_UNIT_TYPE_MB = 1,
        DATA_UNIT_TYPE_GB,
        DATA_UNIT_TYPE_NONE,
 } Data_Unit_Type_E;
@@ -203,12 +201,6 @@ static void _entry_set_displayed_value(Limit_Popup_Data_T *limit_popup_data)
                value = limit_popup_data->smd->sim_1_limits.limit;
 
        switch (limit_popup_data->unit) {
-       case DATA_UNIT_TYPE_B:
-               to_display = (float)value;
-               break;
-       case DATA_UNIT_TYPE_KB:
-               to_display = (float)value / 1024.0;
-               break;
        case DATA_UNIT_TYPE_MB:
                to_display = (float)value / (1024.0 * 1024.0);
                break;
@@ -229,7 +221,6 @@ static void _data_unit_type_cb(void *data, Evas_Object *obj, void *event_info)
        SETTING_TRACE_BEGIN;
        Limit_Popup_Data_T *limit_popup_data = (Limit_Popup_Data_T *)data;
        ret_if(!limit_popup_data);
-       float value = atof(elm_object_text_get(limit_popup_data->content));
 
        SETTING_TRACE("Current PTR: %p, Type: %d, Unit: %d. warning: %llu, limit: %llu",
                        limit_popup_data,
@@ -237,33 +228,18 @@ static void _data_unit_type_cb(void *data, Evas_Object *obj, void *event_info)
                        limit_popup_data->smd->sim_1_limits.warning, limit_popup_data->smd->sim_1_limits.limit);
 
        switch (limit_popup_data->unit) {
-       case DATA_UNIT_TYPE_B:
-               limit_popup_data->unit = DATA_UNIT_TYPE_KB;
-               elm_object_text_set(obj, "KB");
-               value /= 1024;
-               break;
-       case DATA_UNIT_TYPE_KB:
-               limit_popup_data->unit = DATA_UNIT_TYPE_MB;
-               elm_object_text_set(obj, "MB");
-               value /= 1024;
-               break;
        case DATA_UNIT_TYPE_MB:
                limit_popup_data->unit = DATA_UNIT_TYPE_GB;
                elm_object_text_set(obj, "GB");
-               value /= 1024;
                break;
        case DATA_UNIT_TYPE_GB:
-               limit_popup_data->unit = DATA_UNIT_TYPE_B;
-               elm_object_text_set(obj, "B");
-               value *= 1024 * 1024 * 1024;
+               limit_popup_data->unit = DATA_UNIT_TYPE_MB;
+               elm_object_text_set(obj, "MB");
                break;
        default:
                SETTING_TRACE_ERROR("Unkonw unit");
        }
 
-       char buf[256];
-       snprintf(buf, 256, "%.2f", value);
-       elm_object_text_set(limit_popup_data->content, buf);
        SETTING_TRACE_END;
 }
 
@@ -287,13 +263,6 @@ static void _popup_done_cb(void *data, Evas_Object *obj, void *event_info)
        char unit_name[16] = {0};
 
        switch (limit_popup_data->unit) {
-       case DATA_UNIT_TYPE_B:
-               strncpy(unit_name, "B", 16);
-               break;
-       case DATA_UNIT_TYPE_KB:
-               value *= 1024;
-               strncpy(unit_name, "KB", 16);
-               break;
        case DATA_UNIT_TYPE_MB:
                value *= (1024 * 1024);
                strncpy(unit_name, "MB", 16);