Added handling of BACK Button in popup for searching wireless devices 40/150940/3
authorNishant Chaprana <n.chaprana@samsung.com>
Tue, 19 Sep 2017 06:45:13 +0000 (12:15 +0530)
committerNishant Chaprana <n.chaprana@samsung.com>
Tue, 19 Sep 2017 08:52:53 +0000 (14:22 +0530)
Change-Id: I833649044032f1b1f2699e64665cf9b96013807d
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
packaging/org.tizen.settings.spec
src/layout/layout_network.c

index c7356af9c419b90b28d5d28765731de8961557d4..c29292a223750d3faaebff09e31f7e79c23171ca 100755 (executable)
@@ -1,6 +1,6 @@
 Name: org.tizen.settings
 Summary: Settings application for Tizen TV based on AirFlex UX
-Version: 0.2
+Version: 0.3
 Release: 1
 Group: Applications/Core Applications
 License: Apache-2.0
index 9e363780dfd20c45bf622b742fe868a252028ab0..4888bf2b125192a7bd2205e37b34c97a88e624ad 100644 (file)
@@ -52,13 +52,6 @@ enum object_type {
        EO_ENTRY_PASSCODE,
 };
 
-
-static int id_network_type_opt[] = {
-       TYPE_WIRELESS,
-       TYPE_WIRED,
-       TYPE_NEW_NETWORK,
-};
-
 const char *str_network_type_opt[] = {
        STR_WIRELESS,
        STR_WIRED,
@@ -92,7 +85,7 @@ struct _priv * current_priv = NULL;
 
 struct _priv* get_priv()
 {
-        return current_priv;
+       return current_priv;
 }
 
 static struct menumgr_info menu_info[] = {
@@ -142,47 +135,35 @@ static char *_get_connected_ap(void *data, int id)
 
 static void _destroy_status_popup()
 {
-        evas_object_hide(connected_wireless_popup);
-        evas_object_hide(connecting_wireless_popup);
-        evas_object_hide(failed_wireless_popup);
+       evas_object_hide(connected_wireless_popup);
+       evas_object_hide(connecting_wireless_popup);
+       evas_object_hide(failed_wireless_popup);
 
-        evas_object_del(connected_wireless_popup);
-        connected_wireless_popup = NULL;
+       evas_object_del(connected_wireless_popup);
+       connected_wireless_popup = NULL;
 
-        evas_object_del(connecting_wireless_popup);
-        connecting_wireless_popup = NULL;
+       evas_object_del(connecting_wireless_popup);
+       connecting_wireless_popup = NULL;
 
-        evas_object_del(failed_wireless_popup);
-        failed_wireless_popup = NULL;
+       evas_object_del(failed_wireless_popup);
+       failed_wireless_popup = NULL;
 
-        return;
+       return;
 }
 
-
 static void _stop_dismissed_cb(void *data, Evas_Object *obj, void *ei)
 {
        _destroy_status_popup();
        return;
 }
 
-static void _mouse_move_cb(int id, void *data, Evas *e, Evas_Object *obj,
-               Evas_Event_Mouse_Move *ev)
-{
-       if (!obj) {
-               _ERR("Invalid argument.");
-               return;
-       }
-
-       if (!elm_object_focus_get(obj))
-               elm_object_focus_set(obj, EINA_TRUE);
-}
-
 static void _destroy_network_type_popup(struct _priv *priv)
 {
        evas_object_hide(priv->network_type_popup);
        evas_object_del(priv->network_type_popup);
        priv->network_type_popup = NULL;
 }
+
 static void _selected(void *data, int id)
 {
        struct _priv *priv;
@@ -280,79 +261,6 @@ static void _network_type_option_selected(struct _priv *priv, int id,
        priv->cur_type = id;
 }
 
-static void _network_type_option_key_down_cb(int id, void *data, Evas *e,
-               Evas_Object *obj, Evas_Event_Key_Down *ev)
-{
-       struct _priv *priv;
-
-       if (!data || !obj || !ev) {
-               _ERR("Invalid argument.");
-               return;
-       }
-       priv = data;
-
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
-               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
-       )
-               _destroy_network_type_popup(priv);
-       else if (!strcmp(ev->keyname, KEY_ENTER))
-               _network_type_option_selected(priv, id, obj);
-}
-
-static void _network_type_option_mouse_down_cb(int id, void *data, Evas *e,
-               Evas_Object *obj, Evas_Event_Mouse_Down *ev)
-{
-       struct _priv *priv;
-
-       if (!data || !obj || !ev) {
-               _ERR("Invalid argument.");
-               return;
-       }
-       priv = data;
-
-       _network_type_option_selected(priv, id, obj);
-}
-
-static input_handler _network_type_option_input_handler = {
-       .mouse_move = _mouse_move_cb,
-       .key_down = _network_type_option_key_down_cb,
-       .mouse_down = _network_type_option_mouse_down_cb
-};
-
-static void _draw_network_type_popup(struct _priv *priv)
-{
-       Evas_Object *ctxpopup;
-       Evas_Coord x, y, w, h;
-
-       elm_object_signal_emit(priv->network_type_btn, SIG_SELECTED, SRC_ELM);
-
-       ctxpopup = utils_add_ctxpopup(priv->base, COUNT_NETWORK_TYPE,
-                       id_network_type_opt, str_network_type_opt,
-                       &_network_type_option_input_handler, priv, priv->cur_type);
-       if (!ctxpopup) {
-               _ERR("Add ctxpopup failed.");
-               return;
-       }
-
-       evas_object_geometry_get(priv->network_type_btn, &x, &y, &w, &h);
-       evas_object_move(ctxpopup, (x + w / 2), (y + h));
-       evas_object_size_hint_min_set(ctxpopup, w, 0);
-
-       priv->network_type_popup = ctxpopup;
-}
-
-static void _network_type_clicked_cb(int id, void *data, Evas_Object *obj)
-{
-       struct _priv *priv;
-
-       if (!data) {
-               _ERR("Invalid argument.");
-               return;
-       }
-       priv = data;
-
-       _draw_network_type_popup(priv);
-}
 void _destroy_wired_status_popup()
 {
        evas_object_hide(connected_wired_popup);
@@ -374,36 +282,22 @@ void _destroy_wired_status_popup()
        return;
 }
 
-static void _network_type_key_down_cb(int id, void *data, Evas *e,
-               Evas_Object *obj, Evas_Event_Key_Down *ev)
-{
-       if (!data || !ev) {
-               _ERR("Invalid argument.");
-               return;
-       }
-
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
-               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
-                       || !strcmp(ev->keyname, KEY_UP))
-               viewmgr_update_view(VIEW_BASE, UPDATE_FOCUS, NULL);
-}
-
 void _destroy_wireless_status_popup()
 {
-        evas_object_hide(connected_wireless_popup);
-        evas_object_hide(connecting_wireless_popup);
-        evas_object_hide(failed_wireless_popup);
+       evas_object_hide(connected_wireless_popup);
+       evas_object_hide(connecting_wireless_popup);
+       evas_object_hide(failed_wireless_popup);
 
-        evas_object_del(connected_wireless_popup);
-        connected_wireless_popup = NULL;
+       evas_object_del(connected_wireless_popup);
+       connected_wireless_popup = NULL;
 
-        evas_object_del(connecting_wireless_popup);
-        connecting_wireless_popup = NULL;
+       evas_object_del(connecting_wireless_popup);
+       connecting_wireless_popup = NULL;
 
-        evas_object_del(failed_wireless_popup);
-        failed_wireless_popup = NULL;
+       evas_object_del(failed_wireless_popup);
+       failed_wireless_popup = NULL;
 
-        return;
+       return;
 }
 
 /*static void _stop_wireless_dismissed_cb(void *data, Evas_Object *obj, void *ei)
@@ -417,51 +311,56 @@ static void _stop_wired_dismissed_cb(void *data, Evas_Object *obj, void *ei)
        _destroy_wired_status_popup();
        return;
 }
+
 static void _done_wireless_dismissed_cb(void *data, Evas_Object *obj, void *ei)
 {
-        _destroy_wireless_status_popup();
-        return;
+       _destroy_wireless_status_popup();
+       return;
 }
 
 static void _done_wired_dismissed_cb(void *data, Evas_Object *obj, void *ei)
 {
-        _destroy_wired_status_popup();
-        return;
+       _destroy_wired_status_popup();
+       return;
 }
+
 static void _close_wireless_dismissed_cb(void *data, Evas_Object *obj, void *ei)
 {
-        _destroy_wireless_status_popup();
-        return;
+       _destroy_wireless_status_popup();
+       return;
 }
+
 static void _close_wired_dismissed_cb(void *data, Evas_Object *obj, void *ei)
 {
-        _destroy_wired_status_popup();
-        return;
+       _destroy_wired_status_popup();
+       return;
 }
+
 static void _wired_retry_cb(void *data, Evas_Object *obj, void *ei)
 {
        struct _priv *priv;;
        priv = get_priv();
-        if (!priv)
-                return;
+       if (!priv)
+               return;
 
        _destroy_wired_status_popup();
        _retry_wired_network(priv);
 }
+
 static void _wireless_retry_cb(void *data, Evas_Object *obj, void *ei)
 {
        struct _priv *priv;
        priv = data;
-struct wifi_manager_ap_info *ap_info;
+       struct wifi_manager_ap_info *ap_info;
        char *essid;
 
        priv = get_priv();
-        if (!priv)
-                return;
+       if (!priv)
+               return;
 
        priv->connecting_wireless_item = NULL;
        viewmgr_update_view(VIEW_WIRELESS_LIST, GRID_FOREACH,
-                               _grid_find_retry_ap);
+                           _grid_find_retry_ap);
        free(priv->connecting_essid);
        if (priv->connecting_wireless_item == NULL) {
                _ERR("AP no longer present in scan list");
@@ -471,22 +370,21 @@ struct wifi_manager_ap_info *ap_info;
        ap_info = elm_object_item_data_get(priv->connecting_wireless_item);
        essid = ap_info->essid;
        _destroy_wireless_status_popup();
-       if (!_draw_wifi_passcode_popup(priv, essid,true)) {
+       if (!_draw_wifi_passcode_popup(priv, essid, true)) {
                _ERR("Draw passcode popup failed.");
                return;
        }
 //     _wireless_selected_cb(priv->connecting_wireless_item, data);
 
-
 //     _retry_wireless_network(priv);
 }
 
 static void _new_network_cb(void *data, Evas_Object *obj, void *ei)
 {
-        SETTING_TRACE("New network");
+       SETTING_TRACE("New network");
 
-        struct _priv *priv;
-        priv = get_priv();
+       struct _priv *priv;
+       priv = get_priv();
        if (!priv)
                return;
 
@@ -496,46 +394,45 @@ static void _new_network_cb(void *data, Evas_Object *obj, void *ei)
 
 void _popup_connected_wired_status(struct _priv *priv)
 {
-        Evas_Object *ly, *done_btn, *new_network_btn;
+       Evas_Object *ly, *done_btn, *new_network_btn;
 
        _destroy_wired_status_popup();
 
-        connected_wired_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRED, NULL);
-        if (!connected_wired_popup) {
-                _ERR("Add popup failed");
-                return;
-        }
-        ly = utils_add_layout(connected_wired_popup, GRP_CONNECTED_IMAGE_NETWORK_POPUP, EINA_FALSE);
-        if (!ly) {
-                _ERR("Add layout failed.");
-                evas_object_del(connected_wired_popup);
-                return;
-        }
-        elm_object_part_text_set(ly, "part.text.content", STR_WIRED_COMPLETED);
+       connected_wired_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRED, NULL);
+       if (!connected_wired_popup) {
+               _ERR("Add popup failed");
+               return;
+       }
+       ly = utils_add_layout(connected_wired_popup, GRP_CONNECTED_IMAGE_NETWORK_POPUP, EINA_FALSE);
+       if (!ly) {
+               _ERR("Add layout failed.");
+               evas_object_del(connected_wired_popup);
+               return;
+       }
+       elm_object_part_text_set(ly, "part.text.content", STR_WIRED_COMPLETED);
 
        done_btn = elm_button_add(connected_wired_popup);
-        if (!done_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(connected_wired_popup);
-                return;
-        }
+       if (!done_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(connected_wired_popup);
+               return;
+       }
        elm_object_text_set(done_btn, "DONE");
        elm_object_part_content_set(connected_wired_popup, "button1", done_btn);
-        evas_object_smart_callback_add(done_btn, "clicked", _done_wired_dismissed_cb, connected_wired_popup);
+       evas_object_smart_callback_add(done_btn, "clicked", _done_wired_dismissed_cb, connected_wired_popup);
 
        new_network_btn = elm_button_add(connected_wired_popup);
-        if (!new_network_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(connected_wired_popup);
-                return;
-        }
-        elm_object_text_set(new_network_btn, "NEW NETWORK");
-        elm_object_part_content_set(connected_wired_popup, "button2", new_network_btn);
-        evas_object_smart_callback_add(new_network_btn, "clicked", _new_network_cb, connected_wired_popup);
-
+       if (!new_network_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(connected_wired_popup);
+               return;
+       }
+       elm_object_text_set(new_network_btn, "NEW NETWORK");
+       elm_object_part_content_set(connected_wired_popup, "button2", new_network_btn);
+       evas_object_smart_callback_add(new_network_btn, "clicked", _new_network_cb, connected_wired_popup);
 
-        elm_object_content_set(connected_wired_popup, ly);
-        evas_object_show(connected_wired_popup);
+       elm_object_content_set(connected_wired_popup, ly);
+       evas_object_show(connected_wired_popup);
 }
 void _popup_connecting_wired_status(struct _priv *priv)
 {
@@ -544,31 +441,31 @@ void _popup_connecting_wired_status(struct _priv *priv)
        _destroy_wired_status_popup();
 
        connecting_wired_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRED, NULL);
-        if (!connecting_wired_popup) {
-                _ERR("Add popup failed");
-                return;
-        }
-        ly = utils_add_layout(connecting_wired_popup, GRP_CONNECTING_IMAGE_NETWORK_POPUP, EINA_FALSE);
-        if (!ly) {
-                _ERR("Add layout failed.");
-                evas_object_del(connecting_wired_popup);
-                return;
-        }
+       if (!connecting_wired_popup) {
+               _ERR("Add popup failed");
+               return;
+       }
+
+       ly = utils_add_layout(connecting_wired_popup, GRP_CONNECTING_IMAGE_NETWORK_POPUP, EINA_FALSE);
+       if (!ly) {
+               _ERR("Add layout failed.");
+               evas_object_del(connecting_wired_popup);
+               return;
+       }
        elm_object_part_text_set(ly, "part.text.content", STR_WIRED_PROGRESS);
 
-               
-        stop_btn = elm_button_add(connecting_wired_popup);
-        if (!stop_btn) {
-                _ERR("Add button failed.");
-                       evas_object_del(connecting_wired_popup);
-                       return;
-        }
-        elm_object_text_set(stop_btn, "STOP");
-        elm_object_part_content_set(connecting_wired_popup, "button1", stop_btn);
+       stop_btn = elm_button_add(connecting_wired_popup);
+       if (!stop_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(connecting_wired_popup);
+               return;
+       }
+       elm_object_text_set(stop_btn, "STOP");
+       elm_object_part_content_set(connecting_wired_popup, "button1", stop_btn);
        evas_object_smart_callback_add(stop_btn, "clicked", _stop_wired_dismissed_cb, connecting_wired_popup);
 
-        elm_object_content_set(connecting_wired_popup, ly);
-        evas_object_show(connecting_wired_popup);
+       elm_object_content_set(connecting_wired_popup, ly);
+       evas_object_show(connecting_wired_popup);
 }
 
 void _popup_connecting_wireless_status(struct _priv *priv)
@@ -576,104 +473,104 @@ void _popup_connecting_wireless_status(struct _priv *priv)
        Evas_Object *ly, *stop_btn;
        _destroy_wireless_status_popup();
        connecting_wireless_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRELESS, NULL);
-        if (!connecting_wireless_popup) {
-                _ERR("Add popup failed");
-                return;
-        }
-        ly = utils_add_layout(connecting_wireless_popup, GRP_CONNECTING_IMAGE_NETWORK_POPUP, EINA_FALSE);
-        if (!ly) {
-                _ERR("Add layout failed.");
-                evas_object_del(connecting_wireless_popup);
-                return;
-        }
+       if (!connecting_wireless_popup) {
+               _ERR("Add popup failed");
+               return;
+       }
+
+       ly = utils_add_layout(connecting_wireless_popup, GRP_CONNECTING_IMAGE_NETWORK_POPUP, EINA_FALSE);
+       if (!ly) {
+               _ERR("Add layout failed.");
+               evas_object_del(connecting_wireless_popup);
+               return;
+       }
        elm_object_part_text_set(ly, "part.text.content", STR_WIRELESS_PROGRESS);
 
-               
        stop_btn = elm_button_add(connecting_wireless_popup);
-        if (!stop_btn) {
-                _ERR("Add button failed.");
-                       evas_object_del(connecting_wireless_popup);
-                       return;
-        }
-        elm_object_text_set(stop_btn, "STOP");
-        elm_object_part_content_set(connecting_wireless_popup, "button1", stop_btn);
+       if (!stop_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(connecting_wireless_popup);
+               return;
+       }
+       elm_object_text_set(stop_btn, "STOP");
+       elm_object_part_content_set(connecting_wireless_popup, "button1", stop_btn);
        evas_object_smart_callback_add(stop_btn, "clicked", _stop_dismissed_cb, connecting_wireless_popup);
 
-        elm_object_content_set(connecting_wireless_popup, ly);
-        evas_object_show(connecting_wireless_popup);
+       elm_object_content_set(connecting_wireless_popup, ly);
+       evas_object_show(connecting_wireless_popup);
 }
 
 void _popup_connected_wireless_status(struct _priv *priv)
 {
-        Evas_Object *ly, *done_btn;
+       Evas_Object *ly, *done_btn;
        _destroy_wireless_status_popup();
-        connected_wireless_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRELESS, NULL);
-        if (!connected_wireless_popup) {
-                _ERR("Add popup failed");
-                return;
-        }
-        ly = utils_add_layout(connected_wireless_popup, GRP_CONNECTED_IMAGE_NETWORK_POPUP, EINA_FALSE);
-        if (!ly) {
-                _ERR("Add layout failed.");
-                evas_object_del(connected_wireless_popup);
-                return;
-        }
-        elm_object_part_text_set(ly, "part.text.content", STR_WIRELESS_COMPLETED);
-
-        done_btn = elm_button_add(connected_wireless_popup);
-        if (!done_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(connected_wireless_popup);
-                return;
-        }
-        elm_object_text_set(done_btn, "DONE");
-        elm_object_part_content_set(connected_wireless_popup, "button1", done_btn);
-        evas_object_smart_callback_add(done_btn, "clicked", _done_wireless_dismissed_cb, connected_wireless_popup);
-
-        elm_object_content_set(connected_wireless_popup, ly);
-        evas_object_show(connected_wireless_popup);
+       connected_wireless_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRELESS, NULL);
+       if (!connected_wireless_popup) {
+               _ERR("Add popup failed");
+               return;
+       }
+       ly = utils_add_layout(connected_wireless_popup, GRP_CONNECTED_IMAGE_NETWORK_POPUP, EINA_FALSE);
+       if (!ly) {
+               _ERR("Add layout failed.");
+               evas_object_del(connected_wireless_popup);
+               return;
+       }
+       elm_object_part_text_set(ly, "part.text.content", STR_WIRELESS_COMPLETED);
+
+       done_btn = elm_button_add(connected_wireless_popup);
+       if (!done_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(connected_wireless_popup);
+               return;
+       }
+       elm_object_text_set(done_btn, "DONE");
+       elm_object_part_content_set(connected_wireless_popup, "button1", done_btn);
+       evas_object_smart_callback_add(done_btn, "clicked", _done_wireless_dismissed_cb, connected_wireless_popup);
+
+       elm_object_content_set(connected_wireless_popup, ly);
+       evas_object_show(connected_wireless_popup);
 }
 
 void _popup_failed_wireless_status(struct _priv *priv)
 {
-        Evas_Object *ly, *close_btn, *retry_btn;
+       Evas_Object *ly, *close_btn, *retry_btn;
        _destroy_wireless_status_popup();
-        failed_wireless_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRELESS, NULL);
-        if (!failed_wireless_popup) {
-                _ERR("Add popup failed");
-                return;
-        }
-        ly = utils_add_layout(failed_wireless_popup, GRP_FAILED_IMAGE_NETWORK_POPUP, EINA_FALSE);
-        if (!ly) {
-                _ERR("Add layout failed.");
-                evas_object_del(failed_wireless_popup);
-                return;
-        }
+       failed_wireless_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRELESS, NULL);
+       if (!failed_wireless_popup) {
+               _ERR("Add popup failed");
+               return;
+       }
+       ly = utils_add_layout(failed_wireless_popup, GRP_FAILED_IMAGE_NETWORK_POPUP, EINA_FALSE);
+       if (!ly) {
+               _ERR("Add layout failed.");
+               evas_object_del(failed_wireless_popup);
+               return;
+       }
        elm_object_part_text_set(ly, "part.text.content", "Wireless network connection failed.");
        elm_object_part_text_set(ly, "part.text.content1", "Press retry again.");
 
-        close_btn = elm_button_add(failed_wireless_popup);
-        if (!close_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(failed_wireless_popup);
-                return;
-        }
-        elm_object_text_set(close_btn, "CLOSE");
-        elm_object_part_content_set(failed_wireless_popup, "button1", close_btn);
-        evas_object_smart_callback_add(close_btn, "clicked", _close_wireless_dismissed_cb, failed_wireless_popup);
-
-        retry_btn = elm_button_add(failed_wireless_popup);
-        if (!retry_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(failed_wireless_popup);
-                return;
-        }
-        elm_object_text_set(retry_btn, "RETRY");
-        elm_object_part_content_set(failed_wireless_popup, "button2", retry_btn);
-        evas_object_smart_callback_add(retry_btn, "clicked", _wireless_retry_cb, priv);
-
-        elm_object_content_set(failed_wireless_popup, ly);
-        evas_object_show(failed_wireless_popup);
+       close_btn = elm_button_add(failed_wireless_popup);
+       if (!close_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(failed_wireless_popup);
+               return;
+       }
+       elm_object_text_set(close_btn, "CLOSE");
+       elm_object_part_content_set(failed_wireless_popup, "button1", close_btn);
+       evas_object_smart_callback_add(close_btn, "clicked", _close_wireless_dismissed_cb, failed_wireless_popup);
+
+       retry_btn = elm_button_add(failed_wireless_popup);
+       if (!retry_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(failed_wireless_popup);
+               return;
+       }
+       elm_object_text_set(retry_btn, "RETRY");
+       elm_object_part_content_set(failed_wireless_popup, "button2", retry_btn);
+       evas_object_smart_callback_add(retry_btn, "clicked", _wireless_retry_cb, priv);
+
+       elm_object_content_set(failed_wireless_popup, ly);
+       evas_object_show(failed_wireless_popup);
 }
 
 void _destroy_scanning_popup()
@@ -684,6 +581,24 @@ void _destroy_scanning_popup()
        evas_object_del(search_wireless_network_popup);
        search_wireless_network_popup = NULL;
 }
+
+static void _popup_scanning_wireless_key_down_cb(void *data, Evas *e,
+                                                Evas_Object *obj,
+                                                void *event_info)
+{
+       Evas_Event_Key_Down *ev = (Evas_Event_Key_Down*)event_info;
+
+       if (!data || !ev) {
+               _ERR("Invalid argument.");
+               return;
+       }
+
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+           || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) {
+               _destroy_scanning_popup();
+       }
+}
+
 void _popup_scanning_wireless(struct _priv *priv)
 {
        Evas_Object *ly;
@@ -694,6 +609,12 @@ void _popup_scanning_wireless(struct _priv *priv)
                _ERR("Add popup failed");
                return;
        }
+
+       evas_object_event_callback_add(search_wireless_network_popup,
+                                      EVAS_CALLBACK_KEY_DOWN,
+                                      _popup_scanning_wireless_key_down_cb,
+                                      priv);
+
        ly = utils_add_layout(search_wireless_network_popup, GRP_SEARCHING_WIRELESS_NETWORK_POPUP, EINA_FALSE);
        if (!ly) {
                _ERR("Add layout failed.");
@@ -707,88 +628,88 @@ void _popup_scanning_wireless(struct _priv *priv)
 
 void _popup_failed_no_retry_wireless_status(struct _priv *priv)
 {
-        Evas_Object *ly, *close_btn;
+       Evas_Object *ly, *close_btn;
        _destroy_wireless_status_popup();
-        failed_wireless_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRELESS, NULL);
-        if (!failed_wireless_popup) {
-                _ERR("Add popup failed");
-                return;
-        }
-        ly = utils_add_layout(failed_wireless_popup, GRP_FAILED_IMAGE_NETWORK_POPUP, EINA_FALSE);
-        if (!ly) {
-                _ERR("Add layout failed.");
-                evas_object_del(failed_wireless_popup);
-                return;
-        }
+       failed_wireless_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRELESS, NULL);
+       if (!failed_wireless_popup) {
+               _ERR("Add popup failed");
+               return;
+       }
+       ly = utils_add_layout(failed_wireless_popup, GRP_FAILED_IMAGE_NETWORK_POPUP, EINA_FALSE);
+       if (!ly) {
+               _ERR("Add layout failed.");
+               evas_object_del(failed_wireless_popup);
+               return;
+       }
        elm_object_part_text_set(ly, "part.text.content", "Wireless network connection failed.");
        elm_object_part_text_set(ly, "part.text.content1", "Press retry again.");
 
-        close_btn = elm_button_add(failed_wireless_popup);
-        if (!close_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(failed_wireless_popup);
-                return;
-        }
-        elm_object_text_set(close_btn, "CLOSE");
-        elm_object_part_content_set(failed_wireless_popup, "button1", close_btn);
-        evas_object_smart_callback_add(close_btn, "clicked", _close_wireless_dismissed_cb, failed_wireless_popup);
+       close_btn = elm_button_add(failed_wireless_popup);
+       if (!close_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(failed_wireless_popup);
+               return;
+       }
+       elm_object_text_set(close_btn, "CLOSE");
+       elm_object_part_content_set(failed_wireless_popup, "button1", close_btn);
+       evas_object_smart_callback_add(close_btn, "clicked", _close_wireless_dismissed_cb, failed_wireless_popup);
 
-        elm_object_content_set(failed_wireless_popup, ly);
-        evas_object_show(failed_wireless_popup);
+       elm_object_content_set(failed_wireless_popup, ly);
+       evas_object_show(failed_wireless_popup);
 }
 
 void _popup_failed_wired_status(struct _priv *priv)
 {
-        Evas_Object *ly, *close_btn, *retry_btn, *new_network_btn;
+       Evas_Object *ly, *close_btn, *retry_btn, *new_network_btn;
 
        _destroy_wired_status_popup();
 
-        failed_wired_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRED, NULL);
-        if (!failed_wired_popup) {
-                _ERR("Add popup failed");
-                return;
-        }
-        ly = utils_add_layout(failed_wired_popup, GRP_FAILED_IMAGE_NETWORK_POPUP, EINA_FALSE);
-        if (!ly) {
-                _ERR("Add layout failed.");
-                evas_object_del(failed_wired_popup);
-                return;
-        }
-        elm_object_part_text_set(ly, "part.text.content", "Wired network connection failed.");
-        elm_object_part_text_set(ly, "part.text.content1", "Press retry button or plug a network cable into the back of your TV.");
+       failed_wired_popup = utils_add_popup(priv->base, STYLE_POPUP, STR_WIRED, NULL);
+       if (!failed_wired_popup) {
+               _ERR("Add popup failed");
+               return;
+       }
+       ly = utils_add_layout(failed_wired_popup, GRP_FAILED_IMAGE_NETWORK_POPUP, EINA_FALSE);
+       if (!ly) {
+               _ERR("Add layout failed.");
+               evas_object_del(failed_wired_popup);
+               return;
+       }
+       elm_object_part_text_set(ly, "part.text.content", "Wired network connection failed.");
+       elm_object_part_text_set(ly, "part.text.content1", "Press retry button or plug a network cable into the back of your TV.");
 
        close_btn = elm_button_add(failed_wired_popup);
-        if (!close_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(failed_wired_popup);
-                return;
-        }
-        elm_object_text_set(close_btn, "CLOSE");
-        elm_object_part_content_set(failed_wired_popup, "button1", close_btn);
-        evas_object_smart_callback_add(close_btn, "clicked", _close_wired_dismissed_cb, failed_wired_popup);
+       if (!close_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(failed_wired_popup);
+               return;
+       }
+       elm_object_text_set(close_btn, "CLOSE");
+       elm_object_part_content_set(failed_wired_popup, "button1", close_btn);
+       evas_object_smart_callback_add(close_btn, "clicked", _close_wired_dismissed_cb, failed_wired_popup);
 
        retry_btn = elm_button_add(failed_wired_popup);
-        if (!retry_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(failed_wired_popup);
-                return;
-        }
-        elm_object_text_set(retry_btn, "RETRY");
-        elm_object_part_content_set(failed_wired_popup, "button2", retry_btn);
-        evas_object_smart_callback_add(retry_btn, "clicked", _wired_retry_cb, failed_wired_popup);
-
-        new_network_btn = elm_button_add(failed_wired_popup);
-        if (!new_network_btn) {
-                _ERR("Add button failed.");
-                evas_object_del(failed_wired_popup);
-                return;
-        }
-        elm_object_text_set(new_network_btn, "NEW NETWORK");
-        elm_object_part_content_set(failed_wired_popup, "button3", new_network_btn);
-        evas_object_smart_callback_add(new_network_btn, "clicked", _new_network_cb, failed_wired_popup);
-
-        elm_object_content_set(failed_wired_popup, ly);
-        evas_object_show(failed_wired_popup);
+       if (!retry_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(failed_wired_popup);
+               return;
+       }
+       elm_object_text_set(retry_btn, "RETRY");
+       elm_object_part_content_set(failed_wired_popup, "button2", retry_btn);
+       evas_object_smart_callback_add(retry_btn, "clicked", _wired_retry_cb, failed_wired_popup);
+
+       new_network_btn = elm_button_add(failed_wired_popup);
+       if (!new_network_btn) {
+               _ERR("Add button failed.");
+               evas_object_del(failed_wired_popup);
+               return;
+       }
+       elm_object_text_set(new_network_btn, "NEW NETWORK");
+       elm_object_part_content_set(failed_wired_popup, "button3", new_network_btn);
+       evas_object_smart_callback_add(new_network_btn, "clicked", _new_network_cb, failed_wired_popup);
+
+       elm_object_content_set(failed_wired_popup, ly);
+       evas_object_show(failed_wired_popup);
 }
 
 void _popup_no_network_cable_status(struct _priv *priv)
@@ -837,9 +758,8 @@ void _popup_no_network_cable_status(struct _priv *priv)
 
 static void _update_wired_network_status(struct _priv *priv)
 {
-       if (!get_ethernet_profile(priv->wired)) {
+       if (!get_ethernet_profile(priv->wired))
                _ERR("Failed to get ethernet profile !!");
-       }
 
        int res = get_wired_network_status(priv->wired);
 
@@ -880,10 +800,9 @@ static void _retry_wired_network(struct _priv *priv)
        //elm_object_signal_emit(priv->wired_layout, SIG_WIRED_PROGRESS, SRC_ELM);
        //elm_object_part_text_set(priv->wired_layout, "part.wired.text",
        //              STR_WIRED_PROGRESS);
-        evas_object_hide(connected_wired_popup);
-        evas_object_hide(failed_wired_popup);
-        _popup_connecting_wired_status(priv);
-
+       evas_object_hide(connected_wired_popup);
+       evas_object_hide(failed_wired_popup);
+       _popup_connecting_wired_status(priv);
 
        /* If custom option is set, update connection profile */
        //_DBG("Update status : [%s]", (data->result) ? "True" : "False");
@@ -937,38 +856,6 @@ void _retry_wireless_network(struct _priv *priv)
        }
 }
 
-static void _action_key_clicked_cb(int id, void *data, Evas_Object *obj)
-{
-       struct _priv *priv = data;
-
-       switch (priv->cur_type) {
-       case TYPE_WIRELESS:
-               _retry_wireless_network(priv);
-               break;
-       case TYPE_WIRED:
-       case TYPE_NEW_NETWORK:
-               _retry_wired_network(priv);
-               break;
-       default:
-               break;
-       }
-}
-
-static void _action_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
-               Evas_Event_Key_Down *ev)
-{
-       if (!data || !ev) {
-               _ERR("Invalid argument.");
-               return;
-       }
-
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
-               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
-                       || !strcmp(ev->keyname, KEY_UP)) {
-               viewmgr_update_view(VIEW_BASE, UPDATE_FOCUS, NULL);
-       }
-}
-
 static void _grid_realized_cb(int id, void *data, Evas_Object *obj,
                Elm_Object_Item *item)
 {
@@ -1110,9 +997,8 @@ void _wireless_selected_cb(Elm_Object_Item *it, void *data)
                if (!wifi_name)
                        return;
 
-               if (!viewmgr_update_view(VIEW_WIRELESS_LIST, VIEW_HIDE, priv)) {
+               if (!viewmgr_update_view(VIEW_WIRELESS_LIST, VIEW_HIDE, priv))
                        _ERR("Hide view failed");
-               }
 
                if (!_draw_wifi_passcode_popup(priv, wifi_name, false)) {
                        _ERR("Draw passcode popup failed.");
@@ -1163,6 +1049,7 @@ void network_wired_set_update_callbacks(void *data)
                //@TODO: unset previously set callbacks
        */
 }
+
 void network_wireless_set_update_callbacks(void *data)
 {
        /*
@@ -1172,31 +1059,15 @@ void network_wireless_set_update_callbacks(void *data)
                //@TODO: unset previously set callbacks
        */
 }
+
 static void _selected_menu(void *data, int id)
 {
 }
+
 static void _focused_menu(void *data, int id)
 {
        viewmgr_update_view(VIEW_BASE, UPDATE_SUB_ITEM_SELECTED, (void *)LAYOUT_NETWORK);
 }
-static void _focused(int id, void *data, Evas_Object *obj, Elm_Object_Item *item)
-{
-       viewmgr_update_view(VIEW_BASE, UPDATE_SUB_ITEM_SELECTED, (void *)LAYOUT_NETWORK);
-}
-
-static input_handler _network_type_input_handler = {
-       .mouse_move = _mouse_move_cb,
-       .clicked = _network_type_clicked_cb,
-       .key_down = _network_type_key_down_cb,
-       .focused = _focused
-};
-
-static input_handler _action_input_handler = {
-       .mouse_move = _mouse_move_cb,
-       .key_down = _action_key_down_cb,
-       .clicked = _action_key_clicked_cb,
-       .focused = _focused
-};
 
 static input_handler _grid_input_handler = {
        .realized = _grid_realized_cb,
@@ -1209,7 +1080,6 @@ void layoutmgr_add_grid_cb(struct listmgr *listmgr, const char *list_id,
 {
        listmgr_add_inner_grid_cb(listmgr, list_id,
                        &_grid_input_handler, data);
-       
 }
 
 static void _draw_no_contents_message(struct _priv *priv)
@@ -1350,15 +1220,13 @@ static void _data_event_cb(enum event_type type, void *data)
                priv->wireless_update_requested = false;
 
                /* Do not update if network menu is not wireless */
-               if (priv->cur_type != TYPE_WIRELESS) {
+               if (priv->cur_type != TYPE_WIRELESS)
                        return;
-               }
 
                _destroy_scanning_popup();
 
-               if (!viewmgr_add_view(view_wireless_list_get_vclass(), priv)) {
+               if (!viewmgr_add_view(view_wireless_list_get_vclass(), priv))
                        _ERR("Add view failed");
-               }
 
                viewmgr_show_view(VIEW_WIRELESS_LIST);
                list = datamgr_get_data(priv->wirelessmgr);
@@ -1628,10 +1496,10 @@ static void _popup_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void
 
        len = strlen(str);
        if (len >= MIN_WIRELESS_LEN) {
-               if (elm_entry_input_panel_return_key_disabled_get(priv->passcode_entry) == EINA_TRUE) {
+               if (elm_entry_input_panel_return_key_disabled_get(priv->passcode_entry) == EINA_TRUE)
                        elm_entry_input_panel_return_key_disabled_set(priv->passcode_entry, EINA_FALSE);
-               }
-               if(!strcmp(ev->keyname, KEY_ENTER)) {
+
+               if (!strcmp(ev->keyname, KEY_ENTER)) {
                        _popup_connecting_wireless_status(priv);
                        _connect_wifi_with_passcode(priv);
                }
@@ -1656,10 +1524,10 @@ static void _imf_commit_event_cb(void *data, Ecore_IMF_Context *ctx, void *event
 
        len = strlen(buf);
        if (len >= MAX_WIRELESS_LEN) {
-               if (elm_entry_input_panel_return_key_disabled_get(priv->passcode_entry) == EINA_TRUE) {
-                       elm_entry_input_panel_return_key_disabled_set(priv->passcode_entry, EINA_FALSE);}
+               if (elm_entry_input_panel_return_key_disabled_get(priv->passcode_entry) == EINA_TRUE)
+                       elm_entry_input_panel_return_key_disabled_set(priv->passcode_entry, EINA_FALSE);
        } else {
-                       elm_entry_input_panel_return_key_disabled_set(priv->passcode_entry, EINA_TRUE);
+               elm_entry_input_panel_return_key_disabled_set(priv->passcode_entry, EINA_TRUE);
        }
 }
 
@@ -1731,27 +1599,21 @@ Eina_Bool _keyboard_down_cb(void *data, Evas_Object *obj, Evas_Object *src, Evas
        const char *doneKey_str = "Select";
        const char *cancelKey_str = "Cancel";
        //const char *clearKey_str = "Clear";
-       const char *BACK_KEY_STR = "XF86Back"; 
+       const char *BACK_KEY_STR = "XF86Back";
        Evas_Event_Key_Up *pInfo = (Evas_Event_Key_Up*) event_info;
 
-
-        if (!strncmp(pInfo->keyname, cancelKey_str, strlen(cancelKey_str)) || 
-            !strncmp(pInfo->keyname, BACK_KEY_STR, NW_BUF_MAX_LENGTH))
-        {
+       if (!strncmp(pInfo->keyname, cancelKey_str, strlen(cancelKey_str)) ||
+           !strncmp(pInfo->keyname, BACK_KEY_STR, NW_BUF_MAX_LENGTH)) {
 
                _remove_wifi_passcode_popup(priv);
-        }
-
-        else if (!strncmp(pInfo->keyname, doneKey_str, strlen(doneKey_str)))
-        {
-             _DBG("Done Key Pressed from IME");
+       } else if (!strncmp(pInfo->keyname, doneKey_str, strlen(doneKey_str))) {
+               _DBG("Done Key Pressed from IME");
 
                _popup_connecting_wireless_status(priv);
                _connect_wifi_with_passcode(priv);
-        }
-
+       }
 
-    return true;
+       return true;
 }
 
 
@@ -1832,7 +1694,6 @@ static bool _draw_wifi_passcode_popup(struct _priv *priv, char *wifi_name,
 
 static bool _draw_network_buttons(struct _priv *priv, Evas_Object *tab_button)
 {
-       Evas_Object *btn1, *btn2;
        Evas_Object *table = NULL;
 
        if (!priv) {
@@ -1858,31 +1719,6 @@ static bool _draw_network_buttons(struct _priv *priv, Evas_Object *tab_button)
                return false;
        }
 
-       return true;
-//////////////////////////////////////////////////////////
-       btn1 = utils_add_button(priv->ly, PART_NETWORK_TYPE, STYLE_OPTION_BTN,
-                       str_network_type_opt[priv->cur_type]);
-       if (!btn1) {
-               _ERR("Add button failed.");
-               return false;
-       }
-
-       btn2 = utils_add_button(priv->ly, PART_REFRESH, STYLE_BASE_BTN,
-                       STR_REFRESH);
-       if (!btn2) {
-               _ERR("Add button failed.");
-               return false;
-       }
-
-       elm_object_focus_next_object_set(btn1, btn1, ELM_FOCUS_LEFT);
-       elm_object_focus_next_object_set(btn2, btn2, ELM_FOCUS_RIGHT);
-
-       inputmgr_add_callback(btn1, 0, &_network_type_input_handler, priv);
-       inputmgr_add_callback(btn2, 0, &_action_input_handler, priv);
-
-       priv->network_type_btn = btn1;
-       priv->action_btn = btn2;
-
        return true;
 }