Fix N_SE-13547 and N_SE-13516

[apps/core/preloaded/settings.git] / src / setting.c

diff --git a/src/setting.c b/src/setting.c
index cf70ecd..c702afb 100755 (executable)
--- a/src/setting.c
+++ b/src/setting.c
@@ -219,32 +219,11 @@ static void setting_main_rotate(enum appcore_rm m, void *data)
 {
        SETTING_TRACE_BEGIN;
        setting_main_appdata *ad = data;
-       int r;
 
        if (ad == NULL || ad->win_main == NULL)
-               return 0;
-
-#if 0
-       switch (m) {
-       case APPCORE_RM_PORTRAIT_NORMAL:
-               r = 0;
-               break;
-       case APPCORE_RM_PORTRAIT_REVERSE:
-               r = 180;
-               break;
-       case APPCORE_RM_LANDSCAPE_NORMAL:
-               r = 270;
-               break;
-       case APPCORE_RM_LANDSCAPE_REVERSE:
-               r = 90;
-               break;
-       default:
-               r = -1;
-               break;
-       }
-#endif
-       if (r >= 0)
-               elm_win_rotation_with_resize_set(ad->win_main, r);
+               return;
+
+       elm_win_rotation_with_resize_set(ad->win_main, m);
 }
 #endif
 
@@ -417,10 +396,20 @@ static void setting_other_vconf_change_cb(keynode_t *key, void *data)
                int status = 0;
                vconf_get_bool(VCONFKEY_SETAPPL_FLIGHT_MODE_BOOL, &status);
                item_to_update->chk_status = status;
-               if (ad->bAppPause || ad->ug) {
-                       ad->updateItems[GL_ITEM_FLIGHT] = EINA_TRUE;
-               } else { // app is not in pause without ug
-                       elm_check_state_set(item_to_update->eo_check, status);
+               //do not need delay for checks
+               elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
+
+               //Flight mode is ON : Network menu dimmed
+               if (ad->data_network)
+               {
+                       if (status)
+                       {
+                               setting_disable_genlist_item(ad->data_network->item);
+                       }
+                       else
+                       {
+                               setting_enable_genlist_item(ad->data_network->item);
+                       }
                }
                return;
        } else if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL)) {
@@ -431,12 +420,17 @@ static void setting_other_vconf_change_cb(keynode_t *key, void *data)
                vconf_get_bool(VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, &status);
 
                item_to_update->chk_status = !status;
-
-               if (ad->bAppPause || ad->ug) {
-                       ad->updateItems[GL_ITEM_ROTATION] = EINA_TRUE;
-               } else { // app is not in pause without ug
-                       elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
+               //do not need delay for checks
+               elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
+               SETTING_TRACE("item_to_update->chk_status:%d", item_to_update->chk_status);
+               if (item_to_update->chk_status) //rotation function is not blocked
+               {
+                       SETTING_TRACE("Rotation function is on, it is necessary to adjust the device orientation");
+                       int mode = APP_DEVICE_ORIENTATION_0;
+                       mode = app_get_device_orientation();
+                       elm_win_rotation_with_resize_set(ad->win_main, mode);
                }
+
                return;
        } else if (!safeStrCmp(vconf_name, VCONFKEY_NFC_STATE)) {
                SETTING_TRACE_DEBUG("%s updated", vconf_name);
@@ -502,6 +496,22 @@ 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_CALL_STATE)) {
+               //In call situation : Wi-fi / Tethering / Network menu dimmed
+               if (VCONFKEY_CALL_OFF != status)
+               {
+                       if (ad->data_network) setting_disable_genlist_item(ad->data_network->item);
+                       if (ad->data_wifi) setting_disable_genlist_item(ad->data_wifi->item);
+                       //if (ad->data_mobileApp) setting_disable_genlist_item(ad->data_mobileApp->item);
+               }
+               else
+               {
+                       if (ad->data_network) setting_enable_genlist_item(ad->data_network->item);
+                       if (ad->data_wifi) setting_enable_genlist_item(ad->data_wifi->item);
+                       //if (ad->data_mobileApp) setting_enable_genlist_item(ad->data_mobileApp->item);
+               }
+
        } else if (!safeStrCmp(vconf_name, VCONFKEY_BT_STATUS)) {
                item_to_update = ad->data_bt;
                retm_if(!item_to_update, "ad->data_bt is NULL");
@@ -658,7 +668,7 @@ static int setting_main_app_create(void *data)
 
        /* load config file */
        int cfg_operation_ret = setting_cfg_init();
-       PLUGIN_INIT;
+       PLUGIN_INIT(ad);
 
        elm_theme_extension_add(NULL, SETTING_THEME_EDJ_NAME);
 #if SUPPORT_LCD_TIMEOUT_KEEPING
@@ -839,6 +849,17 @@ static int setting_main_app_reset(service_h service, void *data)
        SETTING_TRACE_BEGIN;
        setting_main_appdata *ad = data;
 
+       int value = 0;
+       vconf_get_bool (VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, &value);
+       SETTING_TRACE("value:%d", value);
+       if (!value) //rotation function is not blocked
+       {
+               SETTING_TRACE("Rotation function is on, it is necessary to adjust the device orientation");
+               int mode = APP_DEVICE_ORIENTATION_0;
+               mode = app_get_device_orientation();
+               elm_win_rotation_with_resize_set(ad->win_main, mode);
+       }
+
 #if SUPPORT_LIVEBOX_DEMO
        char *ug_name = NULL;
        if(b != NULL)
@@ -889,7 +910,9 @@ 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_SYSMAN_BATTERY_STATUS_LOW, cb, ad);
+       REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_CALL_STATE, cb, ad);
+       //do need to disable 'Brightness' menu,just disable sub-items in 'Brightness' menu
+       //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);
 
        cb = setting_string_vconf_change_cb;
@@ -908,12 +931,21 @@ static int setting_main_app_reset(service_h service, void *data)
 
        ecore_idler_add(setting_on_idle_lazy, ad);
 
-       //fprintf(stderr, "[TIME] 5. app_create -> app_resume (first display) : %d msec\n", appcore_measure_time());
-       //SETTING_TRACE("[TIME] 5. app_create -> app_resume (first display) : %d msec", appcore_measure_time());
-       //fprintf(stderr, "[TIME] Total. aul_launch -> app_resume (first display) : %d msec\n", appcore_measure_time_from("APP_START_TIME"));
-       //SETTING_TRACE("[TIME] Total. aul_launch -> app_resume (first display) : %d msec", appcore_measure_time_from("APP_START_TIME"));
+       int flight_mode = 0;
+       vconf_get_bool(VCONFKEY_SETAPPL_FLIGHT_MODE_BOOL, &flight_mode);
+       if (flight_mode)
+       {
+               if (ad->data_network) setting_disable_genlist_item(ad->data_network->item);
+       }
 
-       //return 0;
+       int call_status = VCONFKEY_CALL_OFF;
+       vconf_get_int(VCONFKEY_CALL_STATE, &call_status);
+       if (VCONFKEY_CALL_OFF != call_status)
+       {
+               if (ad->data_network) setting_disable_genlist_item(ad->data_network->item);
+               if (ad->data_wifi) setting_disable_genlist_item(ad->data_wifi->item);
+               //if (ad->data_mobileApp) setting_disable_genlist_item(ad->data_mobileApp->item);
+       }
 }
 
 int main(int argc, char *argv[])