From 8ce6770382617371ec365780a8ac4b85cd94390f Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Tue, 18 Oct 2016 18:42:24 +0900 Subject: [PATCH] Fix handling backspace key on new network menu - Fix for TSAM-9096 Change-Id: I206eec046632e38e3e4989178a21731af51c635d Signed-off-by: Jiwan Kim --- src/layout/layout_network.c | 4 ++++ src/view/view_new_network.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c index c910e02..386d8ac 100644 --- a/src/layout/layout_network.c +++ b/src/layout/layout_network.c @@ -475,6 +475,10 @@ static void _grid_focused_cb(int id, void *data, Evas_Object *obj, Elm_Object_It return; } + /* If popup is shown, revert focus to popup */ + if (priv->passcode_popup) + elm_object_focus_set(priv->popup_btn2, EINA_TRUE); + priv->focused_wireless_item = item; /* Unfocus other items */ diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c index 3b43a66..3394ef0 100644 --- a/src/view/view_new_network.c +++ b/src/view/view_new_network.c @@ -312,7 +312,7 @@ static void _base_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, return; } - if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) + if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY) ) { _set_result(priv, EO_BTN_CANCEL); -- 2.7.4