Merge "Fix N_SE-8316,N_SE-5455" into 2.0_beta

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index 2176f05..22d3135 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -144,6 +144,8 @@ static void __device_name_changed_cb(void *data, Evas_Object *obj)
                if (!ad->empty_flag)
                {
                        ad->empty_flag = TRUE;
+                       elm_entry_context_menu_disabled_set(obj, TRUE); //disable the copy&paste&search popup
+                       elm_entry_magnifier_disabled_set(obj, TRUE);
                        Elm_Object_Item *navi_it = elm_naviframe_top_item_get(ad->navi_bar);
                        if (navi_it)
                        {
@@ -163,6 +165,8 @@ static void __device_name_changed_cb(void *data, Evas_Object *obj)
                if (ad->empty_flag)
                {
                        ad->empty_flag = FALSE;
+                       elm_entry_context_menu_disabled_set(obj, FALSE); //enable the copy&paste&search popup
+                       elm_entry_magnifier_disabled_set(obj, FALSE);
                        Elm_Object_Item *navi_it = elm_naviframe_top_item_get(ad->navi_bar);
                        if (navi_it)
                        {

diff --git a/setting-common/src/setting-common-draw-widget.c b/setting-common/src/setting-common-draw-widget.c
index 312a27d..9a42492 100755 (executable)
--- a/setting-common/src/setting-common-draw-widget.c
+++ b/setting-common/src/setting-common-draw-widget.c
@@ -478,7 +478,8 @@ setting_create_editfiled(Evas_Object *win_main, char *title, char *def_str)
        }
        entry = elm_entry_add(win_main);
        elm_object_part_content_set(layout, "elm.swallow.content", entry);
-       elm_entry_context_menu_disabled_set(entry, TRUE);
+       //elm_entry_context_menu_disabled_set(entry, TRUE);
+       //elm_entry_magnifier_disabled_set(entry, TRUE);
        elm_entry_prediction_allow_set(entry, FALSE);
 
        if (def_str && safeStrLen(def_str) > 0) {