Set proper focus on clock and wakeup timer views show

Also, block entire screen when network type popup
is shown in network layout

Change-Id: I415da034e6f3a8d5851c9a5e385bd198a5c3a3a0
Signed-off-by: Agnieszka Janowicz <a.janowicz@samsung.com>

diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c
index 0f22219..13c605f 100644 (file)
--- a/src/layout/layout_network.c
+++ b/src/layout/layout_network.c
@@ -225,7 +225,7 @@ static void _draw_network_type_popup(struct _priv *priv)
 
        elm_object_signal_emit(priv->network_type_btn, SIG_SELECTED, SRC_ELM);
 
-       ctxpopup = utils_add_ctxpopup(priv->ly, COUNT_NETWORK_TYPE,
+       ctxpopup = utils_add_ctxpopup(priv->base, COUNT_NETWORK_TYPE,
                        id_network_type_opt, str_network_type_opt,
                        &_network_type_option_input_handler, priv);
        if (!ctxpopup) {

diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c
index 5b786bd..3a2d866 100644 (file)
--- a/src/view/system/view_clock.c
+++ b/src/view/system/view_clock.c
@@ -319,8 +319,10 @@ static void _show(void *data)
        elm_datetime_value_set(priv->date_part, (Elm_Datetime_Time *)&current_time);
        elm_datetime_value_set(priv->time_part, (Elm_Datetime_Time *)&current_time);
 
-       if (priv->base)
+       if (priv->base) {
                evas_object_show(priv->base);
+               elm_object_focus_set(priv->auto_manual_setup_btn, EINA_TRUE);
+       }
 }
 
 static void _hide(void *data)

diff --git a/src/view/system/view_wakeup_timer.c b/src/view/system/view_wakeup_timer.c
index 9de7737..079a7c3 100644 (file)
--- a/src/view/system/view_wakeup_timer.c
+++ b/src/view/system/view_wakeup_timer.c
@@ -205,7 +205,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        }
 
        inputmgr_add_callback(btn1, EO_TYPE_BTN_CANCEL, &handler, priv);
-       inputmgr_add_callback(btn2, EO_TYPE_BTN_CANCEL, &handler, priv);
+       inputmgr_add_callback(btn2, EO_TYPE_BTN_DONE, &handler, priv);
 
        if (!viewmgr_set_view_data(VIEW_WAKEUP_TIMER, priv)) {
                _ERR("Set view data failed.");
@@ -227,8 +227,10 @@ static void _show(void *data)
                return;
        }
 
-       if (priv->base)
+       if (priv->base) {
                evas_object_show(priv->base);
+               elm_object_focus_set(priv->setup_hs, EINA_TRUE);
+       }
 
        /* Set wakeup timer data */
        _set_wakeup_timer_opts(priv);