From aceb45d64247f7f4a4ffca783178879ceaa92a14 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Sun, 17 Jul 2016 11:12:32 +0900 Subject: [PATCH] [TSAM-6469] Activate rotary event for scan list when AP info is destroy Change-Id: I897fd6387c20126f616eb860e58d59f8183eca40 Signed-off-by: Seonah Moon --- sources/wearable/src/wearable-circle/app_main.c | 4 +--- sources/wearable/src/wearable-circle/view/base.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sources/wearable/src/wearable-circle/app_main.c b/sources/wearable/src/wearable-circle/app_main.c index fb3fb09..0f26639 100755 --- a/sources/wearable/src/wearable-circle/app_main.c +++ b/sources/wearable/src/wearable-circle/app_main.c @@ -1780,7 +1780,6 @@ static void _popup_change_ap_show_use_ap(app_object *app_obj, wifi_ap_object *ap } } -#if 0 static void __ap_info_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { @@ -1805,7 +1804,6 @@ static void __ap_info_del_cb(void *data, Evas *e, layout_scan_ap_list_activate_rotary_event(app_obj->scan); } } -#endif static char *__ap_info_menu_eap_text_get_cb(void *data, Evas_Object *obj, const char *part) { @@ -3491,7 +3489,7 @@ static layout_ap_info_object *_ap_info_create(app_object *app_obj, wifi_ap_objec return NULL; } - //layout_ap_info_set_del_cb(ap_info_obj, __ap_info_del_cb, app_obj); + layout_ap_info_set_del_cb(ap_info_obj, __ap_info_del_cb, app_obj); layout_ap_info_set_menu_cb(ap_info_obj, AP_INFO_MENU_TITLE, __general_title_menu_item_display_ssid_text_get_cb, NULL, NULL, NULL, NULL, NULL); if (security_type == WIFI_SECURITY_TYPE_NONE) { diff --git a/sources/wearable/src/wearable-circle/view/base.c b/sources/wearable/src/wearable-circle/view/base.c index 9361436..920ce56 100755 --- a/sources/wearable/src/wearable-circle/view/base.c +++ b/sources/wearable/src/wearable-circle/view/base.c @@ -386,9 +386,7 @@ Evas_Object *view_base_add_popup_for_circle(view_base_object *self, Evas_Object WIFI_RET_VAL_IF_FAIL(popup, NULL); elm_object_style_set(popup, "circle"); -#if 0 - uxt_popup_set_rotary_event_enabled(popup, EINA_TRUE); -#endif + eext_rotary_object_event_activated_set(popup, EINA_TRUE); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); return popup; -- 2.7.4