Fix device name edit mode

Change-Id: I1f0a33b093eaf092b7d0dde17e59dfabb7e567e0
Signed-off-by: Witold Goralski <w.goralski@samsung.com>

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index bb177c792a05a468d6dc7fc343ae5f21850eb70e..6b98f77f2c6ac3d3e4ac615ddc54a6e6c04a8b72 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -669,6 +669,23 @@ static void __entry_unfocus_cb(void *data, Evas_Object *obj, void *event_info)
        SETTING_TRACE_END;
 }
 
+/**
+ * @brief device name entry activated callback (on Done pressed on keyboard).
+ *
+ * @param data application data SettingAbout structure
+ * @param obj the entry evas object
+ * @param event_info event type
+ */
+static void __entry_activated_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       retm_if(!data || !obj, "Data parameter is NULL");
+
+       Setting_GenGroupItem_Data *item_dev_name = data;
+       SettingAbout *ad = item_dev_name->userdata;
+       __naviframe_btn_done_cb(ad, obj, event_info);
+}
+
 /**
  * @brief device name entry max length reached callback.
  *
@@ -1067,7 +1084,7 @@ static void __creat_name_view(void *data)
                        __entry_device_name_changed_cb,
                        __entry_focused,
                        __entry_unfocus_cb,
-                       NULL,
+                       __entry_activated_cb,
                        __entry_max_len_reached,
                        ELM_INPUT_PANEL_LAYOUT_NORMAL,
                        false,
@@ -1082,7 +1099,7 @@ static void __creat_name_view(void *data)
 
        setting_retm_if(!item_data, "calloc failed");
        item_data->swallow_type = SWALLOW_Type_LAYOUT_EDITFIELD;
-       item_data->isSinglelineFlag = FALSE;
+       item_data->isSinglelineFlag = TRUE;
        item_data->x_callback_cb = __entry_input_panel_event_cb;
        item_data->guide_text = (char *)g_strdup(EMPTY_LIMITATION_STR);
        item_data->focus_unallowed = get_tethering_status();