[TSAM-11177] Screen Reader Read wrong on Chooser page and Wallpers screen 00/103300/1
authorGeunsun, Lee <gs86.lee@samsung.com>
Thu, 8 Dec 2016 03:57:28 +0000 (12:57 +0900)
committerGeunsun, Lee <gs86.lee@samsung.com>
Thu, 8 Dec 2016 03:57:28 +0000 (12:57 +0900)
Change-Id: Ifeed7784238761b534eb2ef8cc0285294d953397

src/apps_view.c

index bb8d7bd..ced9990 100755 (executable)
@@ -2021,6 +2021,7 @@ static void __apps_view_folder_entry_maxlength_reached_cb(void *data, Evas_Objec
 {
        toast_unfocused_show(_("IDS_AT_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"));
 }
+
 static void __apps_view_get_access_chooser_bar(Eina_List **list)
 {
        if (apps_view_s.view_state == VIEW_STATE_CHOOSER) {
@@ -2029,7 +2030,7 @@ static void __apps_view_get_access_chooser_bar(Eina_List **list)
                title->target = (Evas_Object *) edje_object_part_object_get(elm_layout_edje_get(apps_view_s.chooser_btn), APPS_CHOOSER_MIDDLE_LABEL);
                title->parent = apps_view_s.chooser_btn;
                title->name = strdup(edje_object_part_text_get(elm_layout_edje_get(apps_view_s.chooser_btn), APPS_CHOOSER_MIDDLE_LABEL));
-               title->description = NULL;
+               title->description = strdup(_("IDS_LCKSCN_TBOPT_TITLE"));
                title->role = ELM_ATSPI_ROLE_UNKNOWN;
                title->clicked_cb = NULL;
                title->cb_data = NULL;
@@ -2041,7 +2042,7 @@ static void __apps_view_get_access_chooser_bar(Eina_List **list)
                cancel_btn->target = (Evas_Object *) edje_object_part_object_get(elm_layout_edje_get(apps_view_s.chooser_btn), "chooser_left_clickable_space");
                cancel_btn->parent = apps_view_s.chooser_btn;
                cancel_btn->name = strdup(_("IDS_TPLATFORM_ACBUTTON_CANCEL_ABB"));
-               cancel_btn->description = NULL;
+               cancel_btn->description = strdup(_("IDS_ACCS_BODY_BUTTON_TTS"));
                cancel_btn->role = ELM_ATSPI_ROLE_UNKNOWN;
                cancel_btn->clicked_cb = __apps_view_chooser_left_btn_clicked;
                cancel_btn->cb_data = NULL;
@@ -2053,7 +2054,7 @@ static void __apps_view_get_access_chooser_bar(Eina_List **list)
                done_btn->target = (Evas_Object *) edje_object_part_object_get(elm_layout_edje_get(apps_view_s.chooser_btn), "chooser_right_clickable_space");
                done_btn->parent = apps_view_s.chooser_btn;
                done_btn->name = strdup(_("IDS_TPLATFORM_ACBUTTON_DONE_ABB"));
-               done_btn->description = NULL;
+               done_btn->description = strdup(_("IDS_ACCS_BODY_BUTTON_TTS"));
                done_btn->role = ELM_ATSPI_ROLE_UNKNOWN;
                done_btn->clicked_cb = __apps_view_chooser_right_btn_clicked;
                done_btn->cb_data = NULL;
@@ -2078,18 +2079,20 @@ static void __apps_view_get_access_page_app_icon(Eina_List **list)
                                info->target = item->app_layout;
                                info->parent = item->app_layout;
                                info->name = (item->label_str) ? strdup(item->label_str) : NULL;
-                               if (item->is_folder) {
-                                       snprintf(buf, sizeof(buf), "%s, %s", _("IDS_HS_HEADER_FOLDER"), _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"));
-                               } else {
-                                       snprintf(buf, sizeof(buf), "%s, %s", _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"), _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS"));
-                               }
-                               info->description = strdup(buf);
-                               info->role = ELM_ATSPI_ROLE_UNKNOWN;
                                if (apps_view_s.view_state == VIEW_STATE_CHOOSER) {
+                                       info->description = (item->is_folder) ? strdup(_("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN")) : strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_TO_SELECT"));
                                        info->clicked_cb = __apps_view_icon_check_changed_cb;
-                               } else{
+                               } else {
+                                       if (item->is_folder) {
+                                               snprintf(buf, sizeof(buf), "%s, %s", _("IDS_HS_HEADER_FOLDER"), _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"));
+                                       } else {
+                                               snprintf(buf, sizeof(buf), "%s, %s", _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"), _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS"));
+                                       }
+                                       info->description = strdup(buf);
                                        info->clicked_cb = __apps_view_icon_clicked_cb;
                                }
+
+                               info->role = ELM_ATSPI_ROLE_UNKNOWN;
                                info->cb_data = item;
                                info->priority = (item->position + 1) * ACCESS_PRIORITY_APP_ICON;