atspi : Remove unnessary code in moreoption/rotaryselector

Change-Id: Ia0471f369de0d93508762d69ab66496458e9ef82

diff --git a/inc/wearable/efl_extension_common_private.h b/inc/wearable/efl_extension_common_private.h
index 7ab7fc46cda6f3c2b6359a2ae28609ae7634f9bc..ae2f395f79a205bc8e2cb93cf863c66b55d72684 100644 (file)
--- a/inc/wearable/efl_extension_common_private.h
+++ b/inc/wearable/efl_extension_common_private.h
@@ -162,7 +162,6 @@ struct _Eext_Rotary_Selector_Data {
    Evas_Object *backup_last_item_for_atspi;
    Eina_Bool is_first_rotary_control;
    int reading_page_number;
-   Eina_Bool from_moreoption;
    Evas_Object *accessible_need_highlight_obj;
    //
 };
@@ -229,10 +228,6 @@ struct _Eext_More_Option_Data {
    //
 };
 
-//for accessibility(internal API)
-void _rotary_selector_from_moreoption_set(Evas_Object *rotary_selector, Eina_Bool from_more_option);
-//
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/wearable/efl_extension_more_option.c b/src/wearable/efl_extension_more_option.c
index a5d1ebc56f2c630bba8b0db70ba00dc63ccab8d5..480971105704934a0571b19d4d25e75f07e7e779 100644 (file)
--- a/src/wearable/efl_extension_more_option.c
+++ b/src/wearable/efl_extension_more_option.c
@@ -401,7 +401,6 @@ eext_more_option_add(Evas_Object *parent)
         ERR("rotary_selector is NULL!!");
         return NULL;
      }
-   _rotary_selector_from_moreoption_set(mold->rotary_selector, EINA_TRUE);
 
    evas_object_smart_callback_add(mold->rotary_selector, "item,selected", _rotary_selector_item_selected, mold);
    evas_object_smart_callback_add(mold->rotary_selector, "item,clicked", _rotary_selector_item_clicked, mold);

diff --git a/src/wearable/efl_extension_rotary_selector.c b/src/wearable/efl_extension_rotary_selector.c
index 42fce93d17d8fb64d01a0a186468d18b7a239d29..7dd4cf534e0cb6b8beece82e1d207128dfa277eb 100644 (file)
--- a/src/wearable/efl_extension_rotary_selector.c
+++ b/src/wearable/efl_extension_rotary_selector.c
@@ -236,8 +236,6 @@ static char *_accessibility_item_name_set_cb(void *data, Evas_Object *obj);
 static void _accessibility_item_name_set(Eext_Rotary_Selector_Data *rsd, Eext_Rotary_Selector_Item *it);
 static void _accessibility_item_chain_end_set(Eext_Rotary_Selector_Data *rsd);
 static void _rotary_selector_moreoption_opened_cb(void *data, Evas_Object *obj, void *event_info);
-static void _rotary_selector_moreoption_closed_cb(void *data, Evas_Object *obj, void *event_info);
-void _rotary_selector_from_moreoption_set(Evas_Object *rotary_selector, Eina_Bool from_more_option);
 static void _accessibility_item_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info);
 static void _rotary_selector_screen_reader_changed(void *data, Evas_Object *obj, void *event_info);
 static void _accessibility_rotary_selector_item_relationship_set(Evas_Object* obj, Evas_Object* after_obj);
@@ -1409,7 +1407,6 @@ _rotary_selector_rotary_cb(void *data, Evas_Object *obj, Eext_Rotary_Event_Info
                   if (elm_atspi_bridge_utils_is_screen_reader_enabled() && rsd->is_first_rotary_control)
                     {
                        rsd->is_first_rotary_control = EINA_FALSE;
-                       rsd->selected_index = 0;
                     }
                   else
                     {
@@ -1597,7 +1594,6 @@ _rotary_selector_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
    // accessibility
    evas_object_smart_callback_del(rsd->rotary_selector, "atspi,screen,reader,changed", _rotary_selector_screen_reader_changed);
    evas_object_smart_callback_del(rsd->rotary_selector, "more,option,opened", _rotary_selector_moreoption_opened_cb);
-   evas_object_smart_callback_del(rsd->rotary_selector, "more,option,closed", _rotary_selector_moreoption_closed_cb);
    //
 
    if (rsd->item_list)
@@ -2826,8 +2822,6 @@ eext_rotary_selector_add(Evas_Object *parent)
    if (elm_atspi_bridge_utils_is_screen_reader_enabled())
      {
         evas_object_smart_callback_add(rotary_selector, "more,option,opened", _rotary_selector_moreoption_opened_cb, rsd);
-        evas_object_smart_callback_add(rotary_selector, "more,option,closed", _rotary_selector_moreoption_closed_cb, rsd);
-        _rotary_selector_from_moreoption_set(rotary_selector, EINA_FALSE);
         rsd->is_first_rotary_control = EINA_TRUE;
      }
    //
@@ -4062,11 +4056,8 @@ static void
 _rotary_selector_moreoption_opened_cb(void *data, Evas_Object *obj, void *event_info)
 {
    if (!elm_atspi_bridge_utils_is_screen_reader_enabled())
-      return ;
-
+     return ;
    Eext_Rotary_Selector_Data *rsd = NULL;
-   Eina_List *l = NULL;
-   Eext_Rotary_Selector_Item *item = NULL;
    rsd = data;
    if (!rsd)
      {
@@ -4074,48 +4065,9 @@ _rotary_selector_moreoption_opened_cb(void *data, Evas_Object *obj, void *event_
         return;
      }
 
-   EINA_LIST_FOREACH(rsd->item_list, l, item)
-     {
-        Evas_Object *button = item->base.obj;
-        elm_atspi_accessible_can_highlight_set(button, EINA_TRUE);
-     }
    rsd->is_first_rotary_control = EINA_TRUE;
 }
 
-static void
-_rotary_selector_moreoption_closed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-   if (!elm_atspi_bridge_utils_is_screen_reader_enabled())
-      return ;
-
-   Eext_Rotary_Selector_Data *rsd = NULL;
-   Eina_List *l = NULL;
-   Eext_Rotary_Selector_Item *item = NULL;
-   rsd = data;
-   if (!rsd)
-     {
-        ERR("rsd is NULL!!");
-        return;
-     }
-
-
-   EINA_LIST_FOREACH(rsd->item_list, l, item)
-     {
-        Evas_Object *button = item->base.obj;
-        elm_atspi_accessible_can_highlight_set(button, EINA_FALSE);
-     }
-}
-void
-_rotary_selector_from_moreoption_set(Evas_Object *rotary_selector, Eina_Bool from_more_option)
-{
-   Eext_Rotary_Selector_Data *rsd = _eext_rotary_selector_data_get(rotary_selector);
-
-   if (rsd)
-     {
-        rsd->from_moreoption = from_more_option;
-     }
-}
-
 static char *
 _accessibility_item_name_set_cb(void *data, Evas_Object *obj)
 {
@@ -4159,7 +4111,6 @@ _rotary_selector_screen_reader_changed(void *data, Evas_Object *obj, void *event
    if (elm_atspi_bridge_utils_is_screen_reader_enabled())
      {
         evas_object_smart_callback_add(rsd->rotary_selector, "more,option,opened", _rotary_selector_moreoption_opened_cb, rsd);
-        evas_object_smart_callback_add(rsd->rotary_selector, "more,option,closed", _rotary_selector_moreoption_closed_cb, rsd);
 
         EINA_LIST_FOREACH(rsd->item_list, l, item)
           {
@@ -4181,7 +4132,6 @@ _rotary_selector_screen_reader_changed(void *data, Evas_Object *obj, void *event
              elm_atspi_accessible_gesture_cb_set(item->base.obj, NULL, NULL);
           }
         evas_object_smart_callback_del(rsd->rotary_selector, "more,option,opened", _rotary_selector_moreoption_opened_cb);
-        evas_object_smart_callback_del(rsd->rotary_selector, "more,option,closed", _rotary_selector_moreoption_closed_cb);
      }
 }