From: Evgen Servetnik Date: Wed, 9 Aug 2017 08:18:36 +0000 (+0300) Subject: TizenRefApp-9076 New message, Contacts buttons are not read in Thread X-Git-Tag: submit/tizen/20170814.131616~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F143317%2F2;p=profile%2Fwearable%2Fapps%2Fnative%2Fmessage.git TizenRefApp-9076 New message, Contacts buttons are not read in Thread list by Screen Reader Change-Id: I531409fdf52f554621582fbf36446d248e777eeb Signed-off-by: Evgen Servetnik --- diff --git a/src/Composer/Controller/src/Composer.cpp b/src/Composer/Controller/src/Composer.cpp index bcd0c25..7971416 100644 --- a/src/Composer/Controller/src/Composer.cpp +++ b/src/Composer/Controller/src/Composer.cpp @@ -445,9 +445,12 @@ void Composer::showMmsTextLimitExceededPopup(int smsCount, int mmsCount, int max std::string popupMessage = msgArgs("WDS_MSG_BODY_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_EXCEEDED", maxChars); popupMessage += "
"; - if (smsCount == 0) - popupMessage += msgArgs("WDS_MSG_BODY_MESSAGE_WILL_BE_SENT_AS_PD_MMS_MESSAGES", mmsCount); - else + if (smsCount == 0) { + if (mmsCount == 1) + popupMessage += msg("WDS_MSG_POP_SEND_AS_MMS_Q"); + else + popupMessage += msgArgs("WDS_MSG_BODY_MESSAGE_WILL_BE_SENT_AS_PD_MMS_MESSAGES", mmsCount); + } else popupMessage += msgArgs("WDS_MSG_BODY_MESSAGE_WILL_BE_SENT_AS_PD_MMS_MESSAGES_AND_1_SMS_MESSAGE", mmsCount); popup->setText(popupMessage); diff --git a/src/Composer/View/src/RecipFieldView.cpp b/src/Composer/View/src/RecipFieldView.cpp index 77cec24..31fe6d4 100644 --- a/src/Composer/View/src/RecipFieldView.cpp +++ b/src/Composer/View/src/RecipFieldView.cpp @@ -108,7 +108,7 @@ void RecipFieldView::showButton(ButtonId id) } Atspi ao = Atspi(targetButton); - ao.setName((id == ContactButtonId) ? msg("IDS_MSG_BODY_ADD_FROM_CONTACTS_T_TTS") : "Clear"); // TODO: add IDS TRU-694 + ao.setName((id == ContactButtonId) ? msg("IDS_MSG_BODY_ADD_FROM_CONTACTS_T_TTS") : msg("IDS_MSG_HEADER_REMOVE_RECIPIENT")); ao.setRole(ELM_ATSPI_ROLE_PUSH_BUTTON); ao.setReadingInfo(Elm_Accessible_Reading_Info_Type(ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_ROLE)); } diff --git a/src/Conversation/Controller/src/ConvListItem.cpp b/src/Conversation/Controller/src/ConvListItem.cpp index a8ece54..d4352f9 100644 --- a/src/Conversation/Controller/src/ConvListItem.cpp +++ b/src/Conversation/Controller/src/ConvListItem.cpp @@ -156,7 +156,7 @@ bool ConvListItem::launchViewer(const std::list &fileList, unsigned { bool res = m_FileViewer.launchWithCopy(fileList, index); if (!res) - ToastPopup::toast("Can't view this type of file on Gear"); // TODO: localization + ToastPopup::toast(msg("WDS_MSG_TPOP_CANT_VIEW_THIS_TYPE_OF_FILE_ON_YOUR_GEAR_ABB")); return res; } diff --git a/src/MsgThread/View/src/ThreadComposeListViewItem.cpp b/src/MsgThread/View/src/ThreadComposeListViewItem.cpp index 827b1fa..8007d59 100644 --- a/src/MsgThread/View/src/ThreadComposeListViewItem.cpp +++ b/src/MsgThread/View/src/ThreadComposeListViewItem.cpp @@ -53,7 +53,7 @@ Evas_Object *ThreadComposeListViewItem::getContent(ListItem &item, const char *p void ThreadComposeListViewItem::onAttached(ViewItem &item) { setSelectable(false); - getAtspi().canHighlight(false); + getAtspi().setRole(ELM_ATSPI_ROLE_REDUNDANT_OBJECT); } Evas_Object *ThreadComposeListViewItem::getComposeButton()