[TSAM-11180] Screen Reader Read wrong on Chooser page and Edit app on Folder

Change-Id: I9ee2097fc2839cf58cfe3618bba60679fa72f78f

diff --git a/src/apps_view.c b/src/apps_view.c
index 358a2bb..bb8d7bd 100755 (executable)
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -590,6 +590,7 @@ void apps_view_get_access_object_list(Eina_List **list)
                __apps_view_get_access_folder(list);
                return ;
        }
+
        __apps_view_get_access_chooser_bar(list);
        __apps_view_get_access_page_app_icon(list);
        __apps_view_get_access_page_icon_delete_button(list);
@@ -2137,19 +2138,21 @@ static void __apps_view_get_access_folder(Eina_List **list)
 static void __apps_view_get_access_folder_entry(Eina_List **list)
 {
        const char *folder_text = NULL;
+       char buf[STR_MAX] = { 0, };
 
        if (!apps_view_s.opened_folder || !apps_view_s.folder_title_entry)
-               return ;
+               return;
 
 
        folder_text = elm_object_text_get(apps_view_s.folder_title_entry);
 
        access_info_t *info = (access_info_t *)malloc(sizeof(access_info_t));
-       info->is_access_obj = EINA_TRUE;
+       info->is_access_obj = EINA_FALSE;
        info->target = apps_view_s.folder_title_entry;
        info->parent = apps_view_s.opened_folder->folder_layout;
        info->name = (folder_text) ? strdup(folder_text) : NULL;
-       info->description = strdup(_("IDS_ACCS_BODY_DOUBLE_TAP_TO_EDIT_T_TTS"));
+       snprintf(buf, sizeof(buf), "%s, %s", _("IDS_ACCS_POP_TEXT_FIELD_TTS"), _("IDS_ACCS_BODY_DOUBLE_TAP_TO_EDIT_T_TTS"));
+       info->description = strdup(buf);
        info->role = ELM_ATSPI_ROLE_UNKNOWN;
        info->clicked_cb = NULL;
        info->cb_data = NULL;
@@ -2174,7 +2177,7 @@ static void __apps_view_get_access_folder_icon(Eina_List **list)
                        info->target = item->app_layout;
                        info->parent = apps_view_s.opened_folder->folder_layout;
                        info->name = (item->label_str) ? strdup(item->label_str) : NULL;
-                       info->description = (apps_view_s.view_state == VIEW_STATE_EDIT) ? strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_OUTSIDE_TO_REMOVE_FROM_FOLDER")) : strdup(_("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"));
+                       info->description = (apps_view_s.view_state == VIEW_STATE_EDIT) ? strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_OUTSIDE_TO_REMOVE_FROM_FOLDER")) : strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_TO_SELECT"));
                        info->role = ELM_ATSPI_ROLE_UNKNOWN;
                        if (apps_view_s.view_state == VIEW_STATE_CHOOSER)
                                info->clicked_cb = __apps_view_icon_check_changed_cb;
@@ -2196,7 +2199,7 @@ static void __apps_view_get_access_folder_icon(Eina_List **list)
                        info->target = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(apps_view_s.folder_popup_ly), APPS_FOLDER_PLUS_ICON);
                        info->parent = apps_view_s.win;
                        info->name = strdup(_("IDS_HS_TBOPT_ADD_APPS_TO_FOLDER"));
-                       info->description = NULL;
+                       info->description = strdup(_("IDS_ACCS_BODY_BUTTON_TTS"));
                        info->role = ELM_ATSPI_ROLE_UNKNOWN;
                        info->clicked_cb = __apps_view_plus_icon_clicked;
                        info->cb_data = apps_view_s.opened_folder;
@@ -2222,7 +2225,7 @@ static void __apps_view_get_access_folder_icon_delete_button(Eina_List **list)
                        info->target = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(item->app_layout), APPS_ICON_UNINSTALL_BUTTON);
                        info->parent = item->app_layout;
                        info->name = strdup(_("IDS_HS_BUTTON_UNINSTALL_ABB3"));
-                       info->description = NULL;
+                       info->description = strdup(_("IDS_ACCS_BODY_BUTTON_TTS"));
                        info->role = ELM_ATSPI_ROLE_UNKNOWN;
                        info->clicked_cb = __apps_view_icon_uninstall_btn_clicked_cb;
                        info->cb_data = item;