remove the legacy code for accessibility

Change-Id: I98cb63c81a7fb6703ab770660d5c09347ec13413
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>

diff --git a/src/MoreOption.cpp b/src/MoreOption.cpp
index 5693264..41b6b26 100755 (executable)
--- a/src/MoreOption.cpp
+++ b/src/MoreOption.cpp
@@ -262,36 +262,7 @@ void MoreOption::AddMorePage() {
        [](void *data, Evas_Object *obj, void *event_info)
        {
                PRINTFUNC(DLOG_DEBUG, "item,selected");
-
                Eext_Object_Item *selected_item = (Eext_Object_Item *)event_info;
-
-               //for custom accessibility
-               if (elm_config_access_get())
-               {
-                       Evas_Object *panel = elm_object_part_content_get(obj, "elm.swallow.right");
-                       if (!panel) return;
-
-                       Evas_Object *rotary_selector = elm_object_content_get(panel);
-                       if (!rotary_selector) return;
-
-                       Evas_Object *content = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(rotary_selector), "content");
-                       if (!content) return;
-
-                       Evas_Object *content_access = elm_access_object_get(content);
-                       if (!content_access) return;
-
-                       if (eext_more_option_item_part_text_get(selected_item, "selector,main_text"))
-                       {
-                               std::string text;
-                               if(eext_more_option_item_part_text_get(selected_item, "selector,main_text"))
-                                       text = text + std::string(eext_more_option_item_part_text_get(selected_item, "selector,main_text")) + " ";
-
-                               if(eext_more_option_item_part_text_get(selected_item, "selector,main_text"))
-                                       text = text + std::string(eext_more_option_item_part_text_get(selected_item, "selector,sub_text"));
-
-                               elm_access_info_set(content_access, ELM_ACCESS_INFO, text.c_str());
-                       }
-               }
        }, NULL);
 }
 

diff --git a/src/SttFeedback.cpp b/src/SttFeedback.cpp
index 1af1796..a3b5f2a 100755 (executable)
--- a/src/SttFeedback.cpp
+++ b/src/SttFeedback.cpp
@@ -99,12 +99,7 @@ void SttFeedback::OnResult(
 
 void SttFeedback::AutoStart(void) {
        PRINTFUNC(DLOG_DEBUG, "start");
-
-       if (elm_config_access_get()){
-               PRINTFUNC(DLOG_DEBUG, "accessbility on: It will not start automatically.");
-       } else {
-               start_by_press((VoiceData *) owner);
-       }
+       start_by_press((VoiceData *) owner);
 }
 
 void SttFeedback::SttIdle(void)

diff --git a/src/w-input-emoticon.cpp b/src/w-input-emoticon.cpp
index 87d691f..2240448 100755 (executable)
--- a/src/w-input-emoticon.cpp
+++ b/src/w-input-emoticon.cpp
@@ -153,38 +153,6 @@ static void _rotary_selector_item_clicked(void *data, Evas_Object *obj, void *ev
 static void _rotary_selector_item_selected(void *data, Evas_Object *obj, void *event_info)
 {
     PRINTFUNC(DLOG_DEBUG, "%s", __func__);
-    if (elm_config_access_get())
-    {
-        Eext_Object_Item *selected_item = (Eext_Object_Item *)event_info;
-        Eina_List *rotary_selector_list = (Eina_List *)eext_rotary_selector_items_get(obj);
-
-        int i = 0;
-        Eina_List *l = rotary_selector_list;
-        Eext_Object_Item *item = (Eext_Object_Item *)eina_list_data_get(l);
-
-        for (i = 0; l != NULL; i++) {
-            if (selected_item == item)
-                break;
-
-            l = eina_list_next(l);
-            item = (Eext_Object_Item *)eina_list_data_get(l);
-        }
-
-
-               previous_icon = i;
-
-        Evas_Object *content = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(obj), "content");
-        if (!content) return;
-
-        Evas_Object *content_access = elm_access_object_get(content);
-        if (!content_access)
-            return;
-
-        std::string text = std::string(dgettext(PACKAGE, emoticon_info[i].name));
-        PRINTFUNC(DLOG_DEBUG, "[%d]%s", i, text.c_str());
-        text = text + " " + gettext("WDS_TTS_TBBODY_DOUBLE_TAP_TO_SEND");
-        elm_access_say(text.c_str());
-    }
 }
 
 void ise_show_emoticon_popup_rotary(void *data)
@@ -222,13 +190,5 @@ void ise_show_emoticon_popup_rotary(void *data)
     elm_naviframe_item_pop_cb_set(nf_item, _custom_back_cb, NULL);
     eext_rotary_object_event_activated_set(rotary_selector, EINA_TRUE);
 
-    if (elm_config_access_get()){
-               Evas_Object *selector_access = elm_access_object_get(rotary_selector);
-        elm_access_highlight_set(selector_access);
-               eext_rotary_object_event_callback_add(rotary_selector, _rotary_selector_rotary_cb, first_it);
-
-//             ea_screen_reader_access_info_append_cb_set(selector_access, ELM_ACCESS_CONTEXT_INFO, _access_info_prepend_cb, NULL);
-    }
-
     PRINTFUNC(DLOG_DEBUG, "%s", __func__);
 }

diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp
index 7033e8f..eee74fc 100755 (executable)
--- a/src/w-input-selector.cpp
+++ b/src/w-input-selector.cpp
@@ -345,8 +345,6 @@ static Evas_Object * __ise_gl_3button_content_get(void *data, Evas_Object *obj,
                        elm_image_file_set(ic, path_ic.c_str(), NULL);
                        elm_object_content_set(btn, ic);
                        evas_object_layer_set(btn, 32000);
-                       if (elm_config_access_get())
-                               elm_access_object_unregister(btn);
 
                        int powerSavingMode = -1;
                        int ret;
@@ -367,8 +365,6 @@ static Evas_Object * __ise_gl_3button_content_get(void *data, Evas_Object *obj,
                        elm_image_file_set(ic, path_ic.c_str(), NULL);
                        elm_object_content_set(btn, ic);
                        evas_object_layer_set(btn, 32000);
-                       if (elm_config_access_get())
-                               elm_access_object_unregister(btn);
 
                } else if (!strcmp(part, "elm.icon.3")){
                        elm_object_style_set(btn, "anchor");
@@ -377,8 +373,6 @@ static Evas_Object * __ise_gl_3button_content_get(void *data, Evas_Object *obj,
                        elm_object_content_set(btn, ic);
                        evas_object_layer_set(btn, 32000);
                        evas_object_propagate_events_set(btn, EINA_FALSE);
-                       if (elm_config_access_get())
-                               elm_access_object_unregister(btn);
                }
 
                return btn;
@@ -405,29 +399,19 @@ static Evas_Object * __ise_gl_3button_content_get(void *data, Evas_Object *obj,
 
                        evas_object_layer_set(btn, 32000);
                        evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data);
-                       if (elm_config_access_get()){
-                               elm_access_info_set(btn, ELM_ACCESS_INFO, gettext("IDS_IME_MBODY_VOICE_INPUT"));
-//                             elm_access_chain_end_set(btn, ELM_HIGHLIGHT_DIR_PREVIOUS);
-                       }
 
                } else if (!strcmp(part, "elm.icon.2.touch_area")){
                        evas_object_layer_set(btn, 32000);
                        evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data);
-                       if (elm_config_access_get())
-                               elm_access_info_set(btn, ELM_ACCESS_INFO, gettext("IDS_COM_HEADER_EMOTICON"));
                } else if (!strcmp(part, "elm.icon.3.touch_area")) {
                        evas_object_layer_set(btn, 32000);
                        evas_object_propagate_events_set(btn, EINA_FALSE);
                        evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data);
-                       if (elm_config_access_get())
-                               elm_access_info_set(btn, ELM_ACCESS_INFO, gettext("IDS_COM_OPT_KEYBOARD"));
                }
 
                return btn;
        } else if (!strcmp(part, "base")) {
                Evas_Object* btn = elm_button_add(obj);
-               if (elm_config_access_get())
-                       elm_access_object_unregister(btn);
                elm_object_style_set(btn, "ime_transparent");
                return btn;
        }
@@ -522,8 +506,6 @@ static Evas_Object * __ise_gl_1button_content_get(void *data, Evas_Object *obj,
                elm_image_file_set(ic, path_ic.c_str(), NULL);
                elm_object_content_set(btn, ic);
                evas_object_layer_set(btn, 32000);
-               if (elm_config_access_get())
-                       elm_access_object_unregister(btn);
 
                return btn;
        }
@@ -783,15 +765,7 @@ void show_popup_toast(const char *text, bool check_img)
        evas_object_smart_callback_add(popup, "dismissed", _popup_close_cb, NULL);
        evas_object_smart_callback_add(popup, "block,clicked", _popup_back_cb, NULL);
 
-       if(elm_config_access_get() == EINA_FALSE) {
-               elm_popup_timeout_set(popup, 2.0);
-       } else {
-               elm_object_access_info_set(popup, text);
-//             Evas_Object *ao = elm_object_part_access_object_get(popup, "access.outline");
-//             elm_access_info_cb_set(ao, ELM_ACCESS_INFO, _toast_delete_popup_access_info_cb, popup);
-               elm_popup_timeout_set(popup, 8.0);
-       }
-
+       elm_popup_timeout_set(popup, 2.0);
        evas_object_show(popup);
 }
 
@@ -877,44 +851,6 @@ Eina_Bool _access_action_prev_cb(void *data, Evas_Object *obj, Elm_Access_Action
 static void _item_realized(void *data, Evas_Object *obj, void *event_info) //called when list scrolled
 {
        PRINTFUNC(DLOG_DEBUG, "%s", __func__);
-       if (elm_config_access_get()) {
-               Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-               Evas_Object *item_access = elm_object_item_access_object_get(item);
-
-               if (item == it_empty || item == it_title) {
-                       elm_access_object_unregister(item_access);
-                       if (item == it_title)
-                       {
-                               Evas_Object *btn = elm_object_item_part_content_get(item, "elm.icon.1.touch_area");
-                               PRINTFUNC(DLOG_ERROR, "[TNT] 1st button(%p), type:%s", btn, evas_object_type_get(btn));
-                               Evas_Object *btn_access = btn;//elm_access_object_get(btn);
-                               PRINTFUNC(DLOG_ERROR, "[TNT] title item realized!!!!, force_highlight_to_top:%d, is_genlist_highlighed:%d", force_highlight_to_top, is_genlist_highlighed);
-                               if (force_highlight_to_top || !is_genlist_highlighed)
-                               {
-                                       //highlight to first button.
-                                       PRINTFUNC(DLOG_ERROR, "[TNT] force highlight to 1st button(%p), acces_obj:%p", btn, btn_access);
-                                       elm_access_highlight_set(btn_access);
-                                       force_highlight_to_top = EINA_FALSE;
-                                       is_genlist_highlighed = EINA_TRUE;
-                               }
-                               PRINTFUNC(DLOG_ERROR, "[TNT] set highlight pre callback on btn");
-                               elm_access_action_cb_set(btn_access, ELM_ACCESS_ACTION_HIGHLIGHT_PREV, _access_action_prev_cb, obj);
-                       }
-               } else if (item == it_plus) {
-                       //elm_access_object_unregister(item_access); // there is no guide line
-                       elm_access_info_cb_set(item_access, ELM_ACCESS_CONTEXT_INFO, _it_plus_access_info_cb, NULL);
-                       PRINTFUNC(DLOG_ERROR, "[TNT] set highlight next callback on plus item");
-                       elm_access_action_cb_set(item_access, ELM_ACCESS_ACTION_HIGHLIGHT_NEXT, _access_action_next_cb, obj);
-                       if (force_highlight_to_bottom) {
-                               PRINTFUNC(DLOG_ERROR, "[TNT] Forcely set highlight on plus item!!");
-                               elm_access_highlight_set(item_access);
-                               force_highlight_to_bottom = EINA_FALSE;
-                               is_genlist_highlighed = EINA_TRUE;
-                       }
-               } else {
-                       elm_access_info_cb_set(item_access, ELM_ACCESS_CONTEXT_INFO, _access_info_cb, NULL);
-               }
-       }
 }
 
 Evas_Object* _create_genlist(Evas_Object* navi)

diff --git a/src/w-input-stt-voice.cpp b/src/w-input-stt-voice.cpp
index 4d6e8f0..659a7ee 100755 (executable)
--- a/src/w-input-stt-voice.cpp
+++ b/src/w-input-stt-voice.cpp
@@ -509,14 +509,6 @@ static void on_mic_button_press_cb(void *data, Evas_Object *obj, void *event_inf
        PRINTFUNC(NO_PRINT, "");
 
        VoiceData *voicedata = (VoiceData *)data;
-
-       if (elm_config_access_get()){
-               if(bottom_button_access_state == true){
-                       PRINTFUNC(DLOG_DEBUG, "skip until bottom buttom is being read by accessibility");
-                       return;
-               }
-       }
-
        edje_object_signal_emit(_EDJ(voicedata->layout_main), "mouse,clicked,1", "background");
 
        return;
@@ -572,10 +564,6 @@ static Eina_Bool _mic_button_enable_cb(void *data)
 
        elm_object_disabled_set(button, EINA_FALSE);
 
-       if (elm_config_access_get()){
-               bottom_button_access_state = false;
-       }
-
        return ECORE_CALLBACK_CANCEL;
 }
 
@@ -588,13 +576,7 @@ static void _mic_highlighted_cb(void *data, Evas_Object * obj, void *event_info)
        voicedata->sttmanager->GetCurrent() == STT_STATE_PROCESSING)
           return;
 
-
-       if (elm_config_access_get()){
-               bottom_button_access_state = true;
-       } else {
-               elm_object_disabled_set(voicedata->mic_button, EINA_TRUE);
-       }
-
+       elm_object_disabled_set(voicedata->mic_button, EINA_TRUE);
 
        if(voicedata->btn_disabling_timer == NULL){
                ecore_timer_del(voicedata->btn_disabling_timer);
@@ -1174,9 +1156,6 @@ static Evas_Object *__get_genlist_item_content(void *data, Evas_Object *obj, con
                evas_object_propagate_events_set(content, EINA_TRUE);
                evas_object_size_hint_align_set(content, EVAS_HINT_FILL, EVAS_HINT_FILL);
                elm_object_style_set(content, "list");
-
-               if (elm_config_access_get())
-                       elm_access_object_unregister(content);
        }
        return content;
 }
@@ -1441,12 +1420,6 @@ char *_language_list_access_info_cb(void *data, Evas_Object *obj)
 static void _language_list_item_realized(void *data, Evas_Object *obj, void *event_info) //called when list scrolled
 {
        PRINTFUNC(DLOG_DEBUG, "%s", __func__);
-       if (elm_config_access_get()) {
-               Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-               Evas_Object *item_access = elm_object_item_access_object_get(item);
-
-               elm_access_info_cb_set(item_access, ELM_ACCESS_CONTEXT_INFO, _language_list_access_info_cb, (void*)item);
-       }
 }
 
 static Evas_Object *create_language_list(Evas_Object *parent)
@@ -2062,12 +2035,6 @@ static Evas_Object *create_fullview(Evas_Object *parent, VoiceData *r_voicedata)
        Evas_Object *m_mic_button = elm_button_add(layout_main);
        elm_object_style_set(m_mic_button, "vic/micbutton");
        elm_object_part_content_set(layout_main, "MIC", m_mic_button);
-       if (elm_config_access_get()){
-               elm_access_info_cb_set(m_mic_button, ELM_ACCESS_INFO, _mic_access_info_cb, NULL);
-               elm_access_info_cb_set(m_mic_button, ELM_ACCESS_TYPE, _mic_access_info_cb, NULL);
-               elm_access_info_cb_set(m_mic_button, ELM_ACCESS_STATE, _mic_access_info_cb, NULL);
-               evas_object_smart_callback_add(m_mic_button, "access,highlighted", _mic_highlighted_cb, voicedata);
-       }
 
        elm_object_disabled_set(m_mic_button, EINA_TRUE);
        evas_object_smart_callback_add(m_mic_button, "clicked", on_mic_button_press_cb, (void *) voicedata);
@@ -2134,55 +2101,6 @@ static Evas_Object *create_fullview(Evas_Object *parent, VoiceData *r_voicedata)
 
        mo->SetContentLayout(layout_main);
 
-       //accesbility chaining
-       if (elm_config_access_get()) {
-               //right cue
-               Evas_Object *cue_access_right = NULL;
-
-               Evas_Object *panel_right = elm_object_part_content_get(mo->getMoreOptionLayout(), "elm.swallow.right");
-               if (!panel_right) {
-                   PRINTFUNC(DLOG_DEBUG, "panel_right == NULL");
-               }
-               Evas_Object *cue_right = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(panel_right), "cue.event");
-               if (!cue_right) {
-                   PRINTFUNC(DLOG_DEBUG, "cue_right == NULL");
-               }
-               Evas_Object *_access_right = elm_access_object_get(cue_right);
-               if (!_access_right){
-                   PRINTFUNC(DLOG_DEBUG, "_access_right == NULL");
-               }
-               cue_access_right = _access_right;
-
-               //left cue
-               Evas_Object *cue_access_left = NULL;
-               Evas_Object *panel_layout = elm_layout_content_get(layout_main, "left_panel_area");
-               Evas_Object *panel_left = elm_layout_content_get(panel_layout, "elm.swallow.right");
-               if (!panel_left) {
-                   PRINTFUNC(DLOG_DEBUG, "panel_left == NULL");
-               }
-               Evas_Object *cue_left = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(panel_left), "cue.event");
-               if (!cue_left) {
-                   PRINTFUNC(DLOG_DEBUG, "cue_left == NULL");
-               }
-               Evas_Object *_access_left = elm_access_object_register(cue_left, panel_left);
-               if (!_access_left){
-                   PRINTFUNC(DLOG_DEBUG, "_access_left == NULL");
-               }
-               elm_access_info_cb_set(_access_left, ELM_ACCESS_INFO, _left_cue_access_info_cb, panel_left);
-               elm_access_activate_cb_set(_access_left, _left_cue_access_activate_cb, panel_left);
-
-               cue_access_left = _access_left;
-
-               elm_access_highlight_next_set(m_mic_button, ELM_HIGHLIGHT_DIR_NEXT, cue_access_right);
-               elm_access_highlight_next_set(cue_access_right, ELM_HIGHLIGHT_DIR_PREVIOUS, m_mic_button);
-
-               elm_access_highlight_next_set(cue_access_right, ELM_HIGHLIGHT_DIR_NEXT, cue_access_left);
-               elm_access_highlight_next_set(cue_access_left, ELM_HIGHLIGHT_DIR_PREVIOUS, cue_access_right);
-
-               elm_access_highlight_next_set(cue_access_left, ELM_HIGHLIGHT_DIR_NEXT, m_mic_button);
-               elm_access_highlight_next_set(m_mic_button, ELM_HIGHLIGHT_DIR_PREVIOUS, cue_access_left);
-       }
-
        return layout_main;
 }