[TSAM-6315] Enable rotary event to scroll up/down by rotary interaction

Change-Id: Ib7d65043fb9918655d0ae8e9351bd3f07ff7bf3b
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 0df8be1..5f759a5 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,7 +1,7 @@
 %define _unpackaged_files_terminate_build 0
 Name:          wifi-efl-ug
 Summary:       Wi-Fi UI Gadget for TIZEN
-Version:       1.0.188
+Version:       1.0.189
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/sources/wearable/inc/wearable-circle/view/layout_main.h b/sources/wearable/inc/wearable-circle/view/layout_main.h
index 78d89c5..528f9f6 100755 (executable)
--- a/sources/wearable/inc/wearable-circle/view/layout_main.h
+++ b/sources/wearable/inc/wearable-circle/view/layout_main.h
@@ -29,6 +29,7 @@ typedef enum {
        MAIN_MENU_TITLE = -1,
        MAIN_MENU_POWER,
        MAIN_MENU_SCAN,
+       MAIN_MENU_EMPTY,
        MAIN_MENU_SIZE
 } main_menu_type;
 

diff --git a/sources/wearable/src/wearable-circle/app_main.c b/sources/wearable/src/wearable-circle/app_main.c
index cc314e2..2e96067 100755 (executable)
--- a/sources/wearable/src/wearable-circle/app_main.c
+++ b/sources/wearable/src/wearable-circle/app_main.c
@@ -409,6 +409,7 @@ static void __wifi_manager_device_state_changed_cb(wifi_manager_object *manager,
 
        layout_main_menu_update(app_obj->main, MAIN_MENU_POWER);
        layout_main_menu_update(app_obj->main, MAIN_MENU_SCAN);
+       layout_main_menu_update(app_obj->main, MAIN_MENU_EMPTY);
 
        layout_main_menu_set_enable(app_obj->main, MAIN_MENU_POWER, EINA_TRUE);
        layout_main_menu_set_enable(app_obj->main,
@@ -518,6 +519,7 @@ static void __wifi_manager_wifi_use_changed_cb(keynode_t *node, void *user_data)
 
        layout_main_menu_update(app_obj->main, MAIN_MENU_POWER);
        layout_main_menu_update(app_obj->main, MAIN_MENU_SCAN);
+       layout_main_menu_update(app_obj->main, MAIN_MENU_EMPTY);
 }
 
 static void __wifi_manager_background_scan_cb(wifi_manager_object *manager,
@@ -4033,6 +4035,7 @@ static void _main_callbacks_init(layout_main_object *main_obj,
        layout_main_set_menu_cb(main_obj, MAIN_MENU_SCAN,
                                __main_menu_scan_text_get_cb, NULL,
                                __main_menu_scan_tap_cb, app_obj);
+       layout_main_set_menu_cb(main_obj, MAIN_MENU_EMPTY, NULL, NULL, NULL, NULL);
 }
 
 static layout_main_object *_main_create(view_base_object *base_obj,

diff --git a/sources/wearable/src/wearable-circle/view/base.c b/sources/wearable/src/wearable-circle/view/base.c
index 163c9d4..9361436 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/base.c
+++ b/sources/wearable/src/wearable-circle/view/base.c
@@ -311,7 +311,7 @@ Evas_Object *view_base_add_genlist_for_circle(view_base_object *self, Evas_Objec
        WIFI_RET_VAL_IF_FAIL(genlist, NULL);
 #if 0
        uxt_genlist_set_bottom_margin_enabled(genlist, EINA_TRUE);
-
+#endif
        *circle_genlist = eext_circle_object_genlist_add(genlist, self->circle_surface);
        if (!(*circle_genlist)) {
                evas_object_del(genlist);
@@ -319,7 +319,8 @@ Evas_Object *view_base_add_genlist_for_circle(view_base_object *self, Evas_Objec
        }
        eext_circle_object_genlist_scroller_policy_set(*circle_genlist,
                                                       ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
-#endif
+       eext_rotary_object_event_activated_set(*circle_genlist, EINA_TRUE);
+
        return genlist;
 }
 
@@ -347,6 +348,7 @@ Evas_Object *view_base_add_scroller_for_circle(view_base_object *self, Evas_Obje
        }
        eext_circle_object_scroller_policy_set(*circle_scroller,
                                               ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
+       eext_rotary_object_event_activated_set(*circle_scroller, EINA_TRUE);
        return scroller;
 }
 

diff --git a/sources/wearable/src/wearable-circle/view/layout_ap_info.c b/sources/wearable/src/wearable-circle/view/layout_ap_info.c
index dc36177..7300ec0 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_ap_info.c
+++ b/sources/wearable/src/wearable-circle/view/layout_ap_info.c
@@ -156,7 +156,7 @@ static void _append_menu(layout_ap_info_object *self, ap_info_menu_type type,
 
        case AP_INFO_MENU_EMPTY:
                /* Empty item */
-               itc = create_genlist_itc("1text", NULL, NULL, NULL, NULL);
+               itc = create_genlist_itc("padding", NULL, NULL, NULL, NULL);
                break;
 
        default:
@@ -345,11 +345,13 @@ void layout_ap_info_set_connect_button_enable(layout_ap_info_object *self,
 void layout_ap_info_activate_rotary_event(layout_ap_info_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_TRUE);
 }
 
 void layout_ap_info_deactivate_rotary_event(layout_ap_info_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_FALSE);
 }
 
 void layout_ap_info_set_del_cb(layout_ap_info_object *self,

diff --git a/sources/wearable/src/wearable-circle/view/layout_detail.c b/sources/wearable/src/wearable-circle/view/layout_detail.c
index 7dea23b..df56c89 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_detail.c
+++ b/sources/wearable/src/wearable-circle/view/layout_detail.c
@@ -220,11 +220,13 @@ void layout_detail_show(layout_detail_object *self)
 void layout_detail_activate_rotary_event(layout_detail_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_TRUE);
 }
 
 void layout_detail_deactivate_rotary_event(layout_detail_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_FALSE);
 }
 
 void layout_detail_set_del_cb(layout_detail_object *self,

diff --git a/sources/wearable/src/wearable-circle/view/layout_eap_method.c b/sources/wearable/src/wearable-circle/view/layout_eap_method.c
index 5d6d624..a09e329 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_eap_method.c
+++ b/sources/wearable/src/wearable-circle/view/layout_eap_method.c
@@ -192,11 +192,13 @@ void layout_eap_method_pop(layout_eap_method_object *self)
 void layout_eap_method_activate_rotary_event(layout_eap_method_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_TRUE);
 }
 
 void layout_eap_method_deactivate_rotary_event(layout_eap_method_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_FALSE);
 }
 
 void layout_eap_method_set_del_cb(layout_eap_method_object *self,

diff --git a/sources/wearable/src/wearable-circle/view/layout_main.c b/sources/wearable/src/wearable-circle/view/layout_main.c
index 68f767d..28c11cf 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_main.c
+++ b/sources/wearable/src/wearable-circle/view/layout_main.c
@@ -75,6 +75,11 @@ static gboolean _create_menu_itc_array(layout_main_object *obj,
                elm_genlist_item_class_free(menu_item_array[MAIN_MENU_POWER]);
        }
 
+       menu_item_array[MAIN_MENU_EMPTY] = create_genlist_itc("padding", NULL, NULL, NULL, NULL);
+       if (!menu_item_array[MAIN_MENU_EMPTY]) {
+               elm_genlist_item_class_free(menu_item_array[MAIN_MENU_EMPTY]);
+       }
+
        return TRUE;
 }
 
@@ -227,11 +232,13 @@ void layout_main_menu_show(layout_main_object *self, main_menu_type type)
 void layout_main_activate_rotary_event(layout_main_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_TRUE);
 }
 
 void layout_main_deactivate_rotary_event(layout_main_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_FALSE);
 }
 
 void layout_main_set_del_cb(layout_main_object *self,

diff --git a/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c b/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c
index 1b837bf..0c9a548 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c
+++ b/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c
@@ -264,11 +264,13 @@ proxy_setting_menu_type layout_proxy_setting_get_menu_type(layout_proxy_setting_
 void layout_proxy_setting_activate_rotary_event(layout_proxy_setting_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_TRUE);
 }
 
 void layout_proxy_setting_deactivate_rotary_event(layout_proxy_setting_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_FALSE);
 }
 
 void layout_proxy_setting_set_del_cb(layout_proxy_setting_object *self,

diff --git a/sources/wearable/src/wearable-circle/view/layout_scan.c b/sources/wearable/src/wearable-circle/view/layout_scan.c
index 52f92f8..2f7f5b7 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_scan.c
+++ b/sources/wearable/src/wearable-circle/view/layout_scan.c
@@ -551,11 +551,13 @@ void layout_scan_ap_list_clear_data(layout_scan_object *self)
 void layout_scan_ap_list_activate_rotary_event(layout_scan_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->ap_list_circle, EINA_TRUE);
 }
 
 void layout_scan_ap_list_deactivate_rotary_event(layout_scan_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->ap_list_circle, EINA_FALSE);
 }
 
 void layout_scan_set_del_cb(layout_scan_object *self,

diff --git a/sources/wearable/src/wearable-circle/view/layout_static_ip.c b/sources/wearable/src/wearable-circle/view/layout_static_ip.c
index 0a265b9..b937f06 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_static_ip.c
+++ b/sources/wearable/src/wearable-circle/view/layout_static_ip.c
@@ -286,11 +286,13 @@ void layout_static_ip_save_button_set_disable(layout_static_ip_object *self)
 void layout_static_ip_activate_rotary_event(layout_static_ip_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_TRUE);
 }
 
 void layout_static_ip_deactivate_rotary_event(layout_static_ip_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_FALSE);
 }
 
 void layout_static_ip_set_del_cb(layout_static_ip_object *self,

diff --git a/sources/wearable/src/wearable-circle/view/layout_wps_method.c b/sources/wearable/src/wearable-circle/view/layout_wps_method.c
index 3207ce7..8a352a2 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_wps_method.c
+++ b/sources/wearable/src/wearable-circle/view/layout_wps_method.c
@@ -205,11 +205,13 @@ void layout_wps_method_pop(layout_wps_method_object *self)
 void layout_wps_method_activate_rotary_event(layout_wps_method_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_TRUE);
 }
 
 void layout_wps_method_deactivate_rotary_event(layout_wps_method_object *self)
 {
        WIFI_RET_IF_FAIL(self);
+       eext_rotary_object_event_activated_set(self->menu_list_circle, EINA_FALSE);
 }
 
 void layout_wps_method_set_del_cb(layout_wps_method_object *self,

diff --git a/sources/wearable/src/wearable-circle/view/layout_wps_progress.c b/sources/wearable/src/wearable-circle/view/layout_wps_progress.c
index b1bcb0e..4c83de0 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_wps_progress.c
+++ b/sources/wearable/src/wearable-circle/view/layout_wps_progress.c
@@ -381,6 +381,7 @@ void layout_wps_progress_activate_rotary_event(layout_wps_progress_object *self)
 {
        WIFI_RET_IF_FAIL(self != NULL);
        WIFI_RET_IF_FAIL(self->progress_label_circle != NULL);
+       eext_rotary_object_event_activated_set(self->progress_label_circle, EINA_TRUE);
 }
 
 void layout_wps_progress_set_show_finished_cb(layout_wps_progress_object *self,