Enable keypad popup for WPS type Keypad

Change-Id: I40e64c9cc534864d5976950d71d85404ce9b6186
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/packaging/ug-setting-wifidirect-efl.spec b/packaging/ug-setting-wifidirect-efl.spec
index e431e88..586d522 100644 (file)
--- a/packaging/ug-setting-wifidirect-efl.spec
+++ b/packaging/ug-setting-wifidirect-efl.spec
@@ -1,6 +1,6 @@
 Name:       ug-setting-wifidirect-efl
 Summary:    Wi-Fi Direct setting UI gadget
-Version:    1.11.84
+Version:    1.11.85
 Release:    1
 Group:      Applications/Network
 License:    Flora-1.1

diff --git a/popup-wifidirect/include/wfd-app-popup-view.h b/popup-wifidirect/include/wfd-app-popup-view.h
index 5b856ee..95a5cac 100644 (file)
--- a/popup-wifidirect/include/wfd-app-popup-view.h
+++ b/popup-wifidirect/include/wfd-app-popup-view.h
@@ -10,6 +10,7 @@
 #define WFD_GENLIST_2LINE_BOTTOM_TEXT_ICON_STYLE "type2"
 #define WFD_GENLIST_MULTILINE_TEXT_STYLE "multiline"
 #define WFD_GENLIST_GROUP_INDEX_STYLE "group_index"
+#define WFD_GENLIST_SWALLOW_CONTENT_STYLE "full"
 
 Evas_Object *wfd_draw_pop_type_auto_deactivation(Evas_Object * win,  void *userdata);
 

diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c
index f901219..bb435c1 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-popup-view.c
+++ b/popup-wifidirect/src/wfd-app-popup-view.c
@@ -846,7 +846,7 @@ static Evas_Object *__wfd_pin_entry_icon_get(void *data, Evas_Object *obj,
        Evas_Object *entry = NULL;
        Evas_Object *button = NULL;
        Ecore_IMF_Context *imf_context;
-       if (g_strcmp0(part, "elm.icon.entry")) {
+       if (g_strcmp0(part, "elm.swallow.content")) {
                __WFD_APP_FUNC_EXIT__;
                return NULL;
        }
@@ -898,7 +898,6 @@ static Evas_Object *__wfd_pin_entry_icon_get(void *data, Evas_Object *obj,
        evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN,
                        _entry_keydown_cb, ad);
 
-       elm_object_content_set(obj, entry);
        evas_object_show(entry);
        evas_object_smart_callback_add(entry, "changed", _smart_ime_cb, NULL);
        elm_object_focus_set(entry, EINA_TRUE);
@@ -1049,7 +1048,7 @@ Evas_Object *wfd_draw_pop_type_keypad(Evas_Object * win, wfd_popup_t * pop)
 
        ad->pin_entry_itc = elm_genlist_item_class_new();
        if (ad->pin_entry_itc != NULL) {
-               ad->pin_entry_itc->item_style = "entry";
+               ad->pin_entry_itc->item_style = WFD_GENLIST_SWALLOW_CONTENT_STYLE;
                ad->pin_entry_itc->func.text_get = NULL;
                ad->pin_entry_itc->func.content_get = __wfd_pin_entry_icon_get;
                ad->pin_entry_itc->func.state_get = NULL;