Fixed retry popup issue when wifi adapter not connected

Description: Retry popup was not visible when wifi adapter was
not connected to odroid.

Signed-off-by: Abhishek Sansanwal <abhishek.s94@samsung.com>
Change-Id: I65b82b5f8c1384c34fc963c538b552fa4f53a078

diff --git a/res/layout/network.edc b/res/layout/network.edc
index dde81c4..eceae85 100644 (file)
--- a/res/layout/network.edc
+++ b/res/layout/network.edc
@@ -48,6 +48,7 @@ group {
                        type, RECT;
                        scale, 1;
                        description {
+                               min, 500 388;
                                state, "default" 0.0;
                                visible, 0;
                        }

diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c
index b55599c..3e04bd1 100644 (file)
--- a/src/layout/layout_network.c
+++ b/src/layout/layout_network.c
@@ -1209,20 +1209,16 @@ static void _data_event_cb(enum event_type type, void *data)
        case EVENT_DATA_INIT_FAIL_WIRELESS:
                priv->wireless_update_requested = false;
                /* Failed to initialize wireless */
-               //viewmgr_pop_all_views();
-
-               /*viewmgr_add_view(view_wireless_get_vclass(), priv);
 
+               viewmgr_add_view(view_wireless_get_vclass(), priv);
                _DBG("Wireless is not activated");
                if (!viewmgr_show_view(VIEW_WIRELESS))
-                       _ERR("Push wireless view failed.");*/
+                       _ERR("Push wireless view failed.");
                priv->wireless_support = false;
 
                elm_object_signal_emit(priv->ly, SIG_NO_WIRELESS, SRC_ELM);
                elm_object_signal_emit(priv->ly, SIG_LOADING_STOP, SRC_ELM);
                elm_object_part_text_set(priv->ly, PART_NO_NETWORK_TEXT, STR_NO_NETWORK);
-//             listmgr_hide_grid(priv->listmgr, LIST_WIRELESS,
-//                     PART_WIRELESS_LIST);
                break;
 
        case EVENT_DATA_DEACTIVATE_FAIL:

diff --git a/src/view/network/view_wireless.c b/src/view/network/view_wireless.c
index 7e0ebdb..c9aebee 100644 (file)
--- a/src/view/network/view_wireless.c
+++ b/src/view/network/view_wireless.c
@@ -94,7 +94,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
 
        priv = data;
 
-       wifi_popup = utils_add_popup(win, STYLE_POPUP, STR_WIRELESS, NULL);
+       wifi_popup = utils_add_popup(win, NULL, STR_WIRELESS, NULL);
        if (!wifi_popup) {
                _ERR("Add popup failed");
                return NULL;
@@ -239,6 +239,7 @@ static void _clicked_cb(int id, void *data, Evas_Object *obj)
                break;
        case EO_YES:
                viewmgr_pop_view();
+               viewmgr_remove_view(VIEW_WIRELESS);
                datamgr_update(priv->wirelessmgr, WIRELESS_ACTIVATE);
                break;
        default: