Screen reader localization. ver 0.8

Change-Id: I6bd093b3fa44fb9f3988ebca053a09fb5d58bf3c
Signed-off-by: Bumseung Cho <bumseung.cho@samsung.com>

diff --git a/src/ui/FUi_AccessibilityElement.cpp b/src/ui/FUi_AccessibilityElement.cpp
index 00a9419..0b7baba 100644 (file)
--- a/src/ui/FUi_AccessibilityElement.cpp
+++ b/src/ui/FUi_AccessibilityElement.cpp
@@ -266,7 +266,7 @@ _AccessibilityElement::GetReadingContents(void) const
        if (__pLabelId != null)
        {
                String string;
-               GET_STRING_CONFIG(__pLabelId, string);
+               Tizen::Ui::_ResourceManager::GetInstance()->GetString(__pLabelId, string);
                out = string;
        }
        else if(__label.GetLength() > 0)
@@ -277,7 +277,8 @@ _AccessibilityElement::GetReadingContents(void) const
        if (__pTraitId != null)
        {
                String string;
-               GET_STRING_CONFIG(__pTraitId, string);
+               Tizen::Ui::_ResourceManager::GetInstance()->GetString(__pTraitId, string);
+               out += L", ";
                out += string;
        }
        else if(__traitString.GetLength() > 0)
@@ -289,7 +290,8 @@ _AccessibilityElement::GetReadingContents(void) const
        if (__pValueId != null)
        {
                String string;
-               GET_STRING_CONFIG(__pValueId, string);
+               Tizen::Ui::_ResourceManager::GetInstance()->GetString(__pValueId, string);
+               out += L", ";
                out += string;
        }
        else if(__value.GetLength() > 0)
@@ -301,7 +303,8 @@ _AccessibilityElement::GetReadingContents(void) const
        if (__pStatusId != null)
        {
                String string;
-               GET_STRING_CONFIG(__pStatusId, string);
+               Tizen::Ui::_ResourceManager::GetInstance()->GetString(__pStatusId, string);
+               out += L", ";
                out += string;
        }
        else if(__status.GetLength() > 0)
@@ -314,7 +317,8 @@ _AccessibilityElement::GetReadingContents(void) const
                if (__pHintId != null)
                {
                        String string;
-                       GET_STRING_CONFIG(__pHintId, string);
+                       Tizen::Ui::_ResourceManager::GetInstance()->GetString(__pHintId, string);
+                       out += L", ";
                        out += string;
                }
                else if(__hint.GetLength() > 0)
@@ -396,67 +400,88 @@ _AccessibilityElement::IsUpdated(void)
 void
 _AccessibilityElement::SetLabelWithStringId(const char* id)
 {
+       if(__pLabelId)
+       {
+               delete [] __pLabelId;
+       __pLabelId = null;
+       }
        int length = strlen(id);
        if(length == 0)
        {
-               __pLabelId = null;
                return;
        }
        __pLabelId = new char[length+1];
        strcpy(__pLabelId, id);
-       __pLabelId[length] = '0';
+       __pLabelId[length] = '\0';
 }
 void
 _AccessibilityElement::SetTraitWithStringId(const char* id)
 {
+       if(__pTraitId)
+       {
+               delete [] __pTraitId;
+       __pTraitId = null;
+       }
        int length = strlen(id);
        if(length == 0)
        {
-               __pTraitId = null;
                return;
        }
        __pTraitId = new char[length+1];
        strcpy(__pTraitId, id);
-       __pTraitId[length] = '0';
+       __pTraitId[length] = '\0';
 }
 void
 _AccessibilityElement::SetHintWithStringId(const char* id)
 {
+       if(__pHintId)
+       {
+               delete [] __pHintId;
+       __pHintId = null;
+       }
+       
        int length = strlen(id);
        if(length == 0)
        {
-               __pHintId = null;
                return;
        }
        __pHintId = new char[length+1];
        strcpy(__pHintId, id);
-       __pHintId[length] = '0';
+       __pHintId[length] = '\0';
 }
 void
 _AccessibilityElement::SetStatusWithStringId(const char* id)
 {
+       if(__pStatusId)
+       {
+               delete [] __pStatusId;
+       __pStatusId = null;
+       }
        int length = strlen(id);
        if(length == 0)
        {
-               __pStatusId = null;
                return;
        }
        __pStatusId = new char[length+1];
        strcpy(__pStatusId, id);
-       __pStatusId[length] = '0';
+       __pStatusId[length] = '\0';
 }
 void
 _AccessibilityElement::SetValueWithStringId(const char* id)
 {
+       if(__pValueId)
+       {
+               delete [] __pValueId;
+       __pValueId = null;
+       }
        int length = strlen(id);
        if(length == 0)
        {
-               __pValueId = null;
                return;
        }
        __pValueId = new char[length+1];
        strcpy(__pValueId, id);
-       __pValueId[length] = '0';
+       __pValueId[length] = '\0';
 }
 
 }}

diff --git a/src/ui/controls/FUiCtrl_Animation.cpp b/src/ui/controls/FUiCtrl_Animation.cpp
index fe032cd..7b5bed3 100644 (file)
--- a/src/ui/controls/FUiCtrl_Animation.cpp
+++ b/src/ui/controls/FUiCtrl_Animation.cpp
@@ -146,7 +146,8 @@ _Animation::OnAttachedToMainTree(void)
                {
                        __pAccessibilityElement->SetBounds(FloatRectangle(0, 0, GetBounds().width, GetBounds().height));
                        __pAccessibilityElement->SetName(L"Animation");
-                       __pAccessibilityElement->SetTrait(L"Animation");
+                       __pAccessibilityElement->SetLabel(L"Processing");
+                       //__pAccessibilityElement->SetTrait(L"");
                        pContainer->AddElement(*__pAccessibilityElement);
                }
        }

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index 6a8728c..095d17b 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -259,7 +259,7 @@ _Button::InitializeAccessibilityElement(void)
 
                __pTextElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width, GetBoundsF().height));
                __pTextElement->SetLabel(GetText());
-               __pTextElement->SetTrait(L"Button");
+               __pTextElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                __pTextElement->SetName(L"ButtonText");
 
                pContainer->AddElement(*__pTextElement);

diff --git a/src/ui/controls/FUiCtrl_CheckButton.cpp b/src/ui/controls/FUiCtrl_CheckButton.cpp
index 99cdc4d..b1adb9d 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButton.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButton.cpp
@@ -468,7 +468,7 @@ _CheckButton::UpdateAccessibilityElement(void)
                        }
                        __pButtonElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width, GetBoundsF().height));
                        __pButtonElement->SetLabel(label + GetText());
-                       __pButtonElement->SetTrait(L"Tickbox");
+                       __pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_TICKBOX_T_TTS");
                        __pButtonElement->SetName(L"CheckButtonText");
 
                        if (__checkButtonStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON)
@@ -481,7 +481,7 @@ _CheckButton::UpdateAccessibilityElement(void)
                                }
                                __pDetailButtonElement->SetBounds(FloatRectangle(__pCheckButtonPresenter->GetDetailedButtonBoundsF()));
                                __pDetailButtonElement->SetLabel(L"More");
-                               __pDetailButtonElement->SetTrait(L"Button");
+                               __pDetailButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                                __pDetailButtonElement->SetName(L"MoreButtonText");
                        }
                }
@@ -496,7 +496,7 @@ _CheckButton::UpdateAccessibilityElement(void)
                        }
                        __pButtonElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width, GetBoundsF().height));
                        __pButtonElement->SetLabel(label + GetText());
-                       __pButtonElement->SetTrait(L"Radio Button");
+                       __pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_RADIO_BUTTON_T_TTS");
                        __pButtonElement->SetName(L"CheckButtonText");
 
                        if (__checkButtonStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON)
@@ -509,7 +509,7 @@ _CheckButton::UpdateAccessibilityElement(void)
                                }
                                __pDetailButtonElement->SetBounds(FloatRectangle(__pCheckButtonPresenter->GetDetailedButtonBoundsF()));
                                __pDetailButtonElement->SetLabel(L"More");
-                               __pDetailButtonElement->SetTrait(L"Button");
+                               __pDetailButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                                __pDetailButtonElement->SetName(L"MoreButtonText");
                        }
                }
@@ -524,7 +524,7 @@ _CheckButton::UpdateAccessibilityElement(void)
                        }
                        __pButtonElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width, GetBoundsF().height));
                        __pButtonElement->SetLabel(label + GetText());
-                       __pButtonElement->SetTrait(L"On off button");
+                       __pButtonElement->SetTrait("IDS_TPLATFORM_BODY_ON_OFF_BUTTON_T_TTS");
                        __pButtonElement->SetName(L"CheckButtonText");
                }
                UpdateAccessibilityCheckStatus();
@@ -1760,11 +1760,11 @@ _CheckButton::UpdateAccessibilityCheckStatus(void)
                {
                        if(__selected)
                        {
-                               __pButtonElement->SetValue(L"tick");
+                               __pButtonElement->SetValueWithStringId("IDS_TPLATFORM_BODY_TICK_T_TTS");
                        }
                        else
                        {
-                               __pButtonElement->SetValue(L"untick");
+                               __pButtonElement->SetValueWithStringId("IDS_TPLATFORM_BODY_UNTICK_T_TTS");
                        }
                }
        }
@@ -1774,7 +1774,7 @@ _CheckButton::UpdateAccessibilityCheckStatus(void)
                {
                        if(__selected)
                        {
-                               __pButtonElement->SetValue(L"selected");
+                               __pButtonElement->SetValueWithStringId("IDS_TPLATFORM_BODY_SELECTED_T_TTS");
                        }
                        else
                        {
@@ -1789,11 +1789,11 @@ _CheckButton::UpdateAccessibilityCheckStatus(void)
                {
                        if(__selected)
                        {
-                               __pButtonElement->SetValue(L"on");
+                               __pButtonElement->SetValueWithStringId("IDS_TPLATFORM_BODY_ON");
                        }
                        else
                        {
-                               __pButtonElement->SetValue(L"off");
+                               __pButtonElement->SetValueWithStringId("IDS_TPLATFORM_BODY_OFF");
                        }
                }
        }

diff --git a/src/ui/controls/FUiCtrl_ColorPicker.cpp b/src/ui/controls/FUiCtrl_ColorPicker.cpp
index 60ec021..7477448 100644 (file)
--- a/src/ui/controls/FUiCtrl_ColorPicker.cpp
+++ b/src/ui/controls/FUiCtrl_ColorPicker.cpp
@@ -372,12 +372,9 @@ _ColorPicker::InitializeAccessibilityElement(void)
                __pHueBarElement = new (std::nothrow) _AccessibilityElement(true);
                SysTryReturnVoidResult(NID_UI_CTRL, __pHueBarElement != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
-               String hintText(L"flick up and down to adjust");
-
                __pHueBarElement->SetName("ColorPickerColorSlider");
                __pHueBarElement->SetLabel("Hue Slider");
-               __pHueBarElement->SetTrait(ACCESSIBILITY_TRAITS_NONE);
-               __pHueBarElement->SetHint(hintText);
+               __pHueBarElement->SetHintWithStringId("IDS_TPLATFORM_BODY_FLICK_UP_AND_DOWN_TO_ADJUST_THE_POSITION_T_TTS");
                __pHueBarElement->SetSupportOperatingGesture(false);
                __pHueBarElement->SetBounds(FloatRectangle(floatBounds.x, floatBounds.y, floatBounds.width, blockHeight));
                pContainer->AddElement(*__pHueBarElement);
@@ -392,7 +389,7 @@ _ColorPicker::InitializeAccessibilityElement(void)
                __pSaturationBarElement->SetName("ColorPickerSaturationSlider");
                __pSaturationBarElement->SetLabel("Saturation Slider");
                __pSaturationBarElement->SetTrait(ACCESSIBILITY_TRAITS_NONE);
-               __pSaturationBarElement->SetHint(hintText);
+               __pSaturationBarElement->SetHintWithStringId("IDS_TPLATFORM_BODY_FLICK_UP_AND_DOWN_TO_ADJUST_THE_POSITION_T_TTS");
                __pSaturationBarElement->SetSupportOperatingGesture(false);
                __pSaturationBarElement->SetBounds(FloatRectangle(floatBounds.x, floatBounds.y + blockHeight, floatBounds.width, blockHeight));
                pContainer->AddElement(*__pSaturationBarElement);
@@ -407,7 +404,7 @@ _ColorPicker::InitializeAccessibilityElement(void)
                __pLuminanceBarElement->SetName("ColorPickerBrightnessSlider");
                __pLuminanceBarElement->SetLabel("Luminance Slider");
                __pLuminanceBarElement->SetTrait(ACCESSIBILITY_TRAITS_NONE);
-               __pLuminanceBarElement->SetHint(hintText);
+               __pLuminanceBarElement->SetHintWithStringId("IDS_TPLATFORM_BODY_FLICK_UP_AND_DOWN_TO_ADJUST_THE_POSITION_T_TTS");
                __pLuminanceBarElement->SetSupportOperatingGesture(false);
                __pLuminanceBarElement->SetBounds(FloatRectangle(floatBounds.x, floatBounds.y + 2 * blockHeight, floatBounds.width, blockHeight));
                pContainer->AddElement(*__pLuminanceBarElement);

diff --git a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
index 790f02f..26f5d6d 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
@@ -1615,7 +1615,7 @@ _ContextMenuGridPresenter::SetAllAccessibilityElement(void)
                SysTryReturnVoidResult(NID_UI_CTRL, pElementContextMenu, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
 
                pElementContextMenu->SetSupportOperatingGesture(false);
-               pElementContextMenu->SetTrait(L"Contextual popup");
+               pElementContextMenu->SetTraitWithStringId("IDS_TPLATFORM_BODY_CONTEXTUAL_POP_UP_T_TTS");
                pElementContextMenu->SetHint(L"double tap to close");
                pElementContextMenu->SetBounds(FloatRectangle(0.0f, 0.0f, __pContextMenu->GetBoundsF().width, __pContextMenu->GetBoundsF().height));
                pContainer->AddElement(*pElementContextMenu);
@@ -1638,7 +1638,7 @@ _ContextMenuGridPresenter::SetAllAccessibilityElement(void)
                                        pElement->SetLabel(pItem->GetText());
                                }
 
-                               pElement->SetTrait(L"Contextual popup");
+                               pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_CONTEXTUAL_POP_UP_T_TTS");
                                pElement->SetBounds(pItem->GetDrawRect());
                                pContainer->AddElement(*pElement);
                                __pContextMenu->AddAccessibilityElement(*pElement);

diff --git a/src/ui/controls/FUiCtrl_ContextMenuItem.cpp b/src/ui/controls/FUiCtrl_ContextMenuItem.cpp
index 95cc6ab..d8a18a4 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenuItem.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuItem.cpp
@@ -161,7 +161,7 @@ _ContextMenuItem::InitializeAccessibilityElement(void)
                _AccessibilityElement* pElement = new (std::nothrow) _AccessibilityElement(true);
                SysTryReturnVoidResult(NID_UI_CTRL, pElement, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
 
-               pElement->SetTrait(L"Contextual popup");
+               pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_CONTEXTUAL_POP_UP_T_TTS");
                pElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width, GetBoundsF().height));
                pContainer->AddElement(*pElement);
        }

diff --git a/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp b/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
index b761da1..f3ad757 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
@@ -1099,7 +1099,7 @@ _ContextMenuListPresenter::SetAllAccessibilityElement(void)
                SysTryReturnVoidResult(NID_UI_CTRL, pElementContextMenu, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
 
                pElementContextMenu->SetSupportOperatingGesture(false);
-               pElementContextMenu->SetTrait(L"Contextual popup");
+               pElementContextMenu->SetTraitWithStringId("IDS_TPLATFORM_BODY_CONTEXTUAL_POP_UP_T_TTS");
                pElementContextMenu->SetHint(L"double tap to close");
                pElementContextMenu->SetBounds(FloatRectangle(0.0f, 0.0f, __pContextMenu->GetBoundsF().width, __pContextMenu->GetBoundsF().height));
                pContainerContextMenu->AddElement(*pElementContextMenu);

diff --git a/src/ui/controls/FUiCtrl_DateTimeBar.cpp b/src/ui/controls/FUiCtrl_DateTimeBar.cpp
index ba0a1f5..7470f23 100644 (file)
--- a/src/ui/controls/FUiCtrl_DateTimeBar.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimeBar.cpp
@@ -475,7 +475,7 @@ _DateTimeBar::AddAccessibilityElement(const FloatRectangle& itemBounds, const St
        String labelText = itemText;
        pAccessibilityElement->SetBounds(itemBounds);
        pAccessibilityElement->SetLabel(labelText);
-       pAccessibilityElement->SetTrait(GetAccessibilityTraitValue());
+       pAccessibilityElement->SetTraitWithStringId(GetAccessibilityTraitValue());
        pContainer->AddElement(*pAccessibilityElement);
        __accessibilityElements.Add(pAccessibilityElement);
 
@@ -494,7 +494,7 @@ _DateTimeBar::InsertAccessibilityElementAt(int index, const FloatRectangle& item
        String labelText = itemText;
        pAccessibilityElement->SetBounds(itemBounds);
        pAccessibilityElement->SetLabel(labelText);
-       pAccessibilityElement->SetTrait(GetAccessibilityTraitValue());
+       pAccessibilityElement->SetTraitWithStringId(GetAccessibilityTraitValue());
        pContainer->InsertElement(*pAccessibilityElement, index);
        __accessibilityElements.InsertAt(pAccessibilityElement, index);
 
@@ -539,30 +539,35 @@ _DateTimeBar::RemoveAllAccessibilityElement(void)
        return;
 }
 
-AccessibilityTraits
-_DateTimeBar::GetAccessibilityTraitValue()
+const char*
+_DateTimeBar::GetAccessibilityTraitValue() const
 {
-       AccessibilityTraits traitsValue = ACCESSIBILITY_TRAITS_NONE;
+       const char* ACCESSIBILITY_TRAITS_DAY = "IDS_TPLATFORM_BODY_DAY_LC";
+       const char* ACCESSIBILITY_TRAITS_MONTH = "IDS_TPLATFORM_BODY_MONTH_LC";
+       const char* ACCESSIBILITY_TRAITS_YEAR = "IDS_TPLATFORM_BODY_YEAR_LC";
+       const char* ACCESSIBILITY_TRAITS_HOUR = "IDS_TPLATFORM_BODY_HOUR_LC";
+       const char* ACCESSIBILITY_TRAITS_MINUTE = "IDS_TPLATFORM_BODY_MINUTE_LC";
+       char* traitsValue = null;
 
        if (GetSelectedBoxId() == DATETIME_ID_DAY)
        {
-               traitsValue = ACCESSIBILITY_TRAITS_DAY;
+               traitsValue = const_cast<char*>(ACCESSIBILITY_TRAITS_DAY);
        }
        else if (GetSelectedBoxId() == DATETIME_ID_MONTH)
        {
-               traitsValue = ACCESSIBILITY_TRAITS_MONTH;
+               traitsValue = const_cast<char*>(ACCESSIBILITY_TRAITS_MONTH);
        }
        else if (GetSelectedBoxId() == DATETIME_ID_YEAR)
        {
-               traitsValue = ACCESSIBILITY_TRAITS_YEAR;
+               traitsValue = const_cast<char*>(ACCESSIBILITY_TRAITS_YEAR);
        }
        else if (GetSelectedBoxId() == DATETIME_ID_HOUR)
        {
-               traitsValue = ACCESSIBILITY_TRAITS_HOUR;
+               traitsValue = const_cast<char*>(ACCESSIBILITY_TRAITS_HOUR);
        }
        else if (GetSelectedBoxId() == DATETIME_ID_MINUTE)
        {
-               traitsValue = ACCESSIBILITY_TRAITS_MINUTE;
+               traitsValue = const_cast<char*>(ACCESSIBILITY_TRAITS_MINUTE);
        }
 
        return traitsValue;

diff --git a/src/ui/controls/FUiCtrl_DateTimePicker.cpp b/src/ui/controls/FUiCtrl_DateTimePicker.cpp
index cab2b3b..899c8d0 100644 (file)
--- a/src/ui/controls/FUiCtrl_DateTimePicker.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimePicker.cpp
@@ -777,7 +777,6 @@ void
 _DateTimePicker::SetAccessibilityElementText(int index, const String& text, bool isAmPm)
 {
        _AccessibilityElement* pElement = null;
-       String hintAmPmText(L"Double tap to change to ");
 
        if (__accessibilityElements.GetAt(index, pElement) == E_SUCCESS)
        {
@@ -795,16 +794,7 @@ _DateTimePicker::SetAccessibilityElementText(int index, const String& text, bool
                        dateTimeUtils.GetAmPm(amText, AM_TYPE);
                        dateTimeUtils.GetAmPm(pmText, PM_TYPE);
 
-                       if (text == amText)
-                       {
-                               hintAmPmText.Append(pmText);
-                       }
-                       else
-                       {
-                               hintAmPmText.Append(amText);
-                       }
-
-                       pElement->SetHint(hintAmPmText);
+                       pElement->SetHintWithStringId("IDS_TPLATFORM_BODY_DOUBLE_TAP_TO_CHANGE_T_TTS");
                }
        }
 
@@ -871,23 +861,23 @@ _DateTimePicker::OnAttachedToMainTree(void)
                                switch (displayBoxId)
                                {
                                case DATETIME_ID_DAY:
-                                       pElement->SetTrait(ACCESSIBILITY_TRAITS_DAY);
+                                       pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_DAY_LC");
                                        pElement->SetHint(hintText);
                                        break;
                                case DATETIME_ID_MONTH:
-                                       pElement->SetTrait(ACCESSIBILITY_TRAITS_MONTH);
+                                       pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_MONTH_LC");
                                        pElement->SetHint(hintText);
                                        break;
                                case DATETIME_ID_YEAR:
-                                       pElement->SetTrait(ACCESSIBILITY_TRAITS_YEAR);
+                                       pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_YEAR_LC");
                                        pElement->SetHint(hintText);
                                        break;
                                case DATETIME_ID_HOUR:
-                                       pElement->SetTrait(ACCESSIBILITY_TRAITS_HOUR);
+                                       pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_HOUR_LC");
                                        pElement->SetHint(hintText);
                                        break;
                                case DATETIME_ID_MINUTE:
-                                       pElement->SetTrait(ACCESSIBILITY_TRAITS_MINUTE);
+                                       pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_MINUTE_LC");
                                        pElement->SetHint(hintText);
                                        break;
                                }
@@ -911,9 +901,6 @@ _DateTimePicker::OnAttachedToMainTree(void)
                        }
                }
 
-               // AmPm Button
-               String hintAmPmText(L"Double tap to change");
-
                pAmPmBox = __pPresenter->GetAmPmBox();
                if (pAmPmBox != null)
                {
@@ -931,8 +918,8 @@ _DateTimePicker::OnAttachedToMainTree(void)
 
                        pElement->SetLabel(pAmPmBox->GetText());
                        pElement->SetBounds(amPmBoxBounds);
-                       pElement->SetTrait(ACCESSIBILITY_TRAITS_BUTTON);
-                       pElement->SetHint(hintAmPmText);
+                       pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
+                       pElement->SetHintWithStringId("IDS_TPLATFORM_BODY_DOUBLE_TAP_TO_CHANGE_T_TTS");
                        pContainer->AddElement(*pElement);
                }
 

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 97150be..b77d7df 100755 (executable)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -523,8 +523,8 @@ _Edit::Initialize(int editStyle, InputStyle inputStyle, int limitLength, GroupSt
                {
                        __pClearButtonTextAccessibilityElement = new _AccessibilityElement(true);
                        __pClearButtonTextAccessibilityElement->SetBounds(_pEditPresenter->GetClearIconBoundsF());
-                       __pClearButtonTextAccessibilityElement->SetLabel(L"all clear, button");
-                       __pClearButtonTextAccessibilityElement->SetTrait(L"Edit Field");
+                       __pClearButtonTextAccessibilityElement->SetLabel(L"all clear");
+                       __pClearButtonTextAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                        __pClearButtonTextAccessibilityElement->SetName(L"EditFieldClearButton");
                        pEditAccessibilityContainer->AddElement(*__pClearButtonTextAccessibilityElement);
                }
@@ -1078,7 +1078,7 @@ _Edit::UpdateAccessibilityElement(EditAccessibilityElementType type)
                                        __pClearButtonTextAccessibilityElement = new _AccessibilityElement(true);
                                        __pClearButtonTextAccessibilityElement->SetBounds(_pEditPresenter->GetClearIconBoundsF());
                                        __pClearButtonTextAccessibilityElement->SetLabel(L"all clear");
-                                       __pClearButtonTextAccessibilityElement->SetTrait(L"Button");
+                                       __pClearButtonTextAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                                        __pClearButtonTextAccessibilityElement->SetName(L"EditFieldClearButton");
                                        pEditAccessibilityContainer->AddElement(*__pClearButtonTextAccessibilityElement);
                                }

diff --git a/src/ui/controls/FUiCtrl_EditDate.cpp b/src/ui/controls/FUiCtrl_EditDate.cpp
index 1b7ee79..7a5f7bb 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDate.cpp
+++ b/src/ui/controls/FUiCtrl_EditDate.cpp
@@ -702,17 +702,17 @@ _EditDate::CreateAccessibilityElement(void)
 
                __pAccessibilityYearElement = new _AccessibilityElement(true);
                __pAccessibilityYearElement->SetBounds(yearBounds);
-               __pAccessibilityYearElement->SetTrait(ACCESSIBILITY_TRAITS_YEAR);
+               __pAccessibilityYearElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_YEAR_LC");
                __pAccessibilityYearElement->SetHint(hintText);
 
                __pAccessibilityMonthElement = new _AccessibilityElement(true);
                __pAccessibilityMonthElement->SetBounds(monthBounds);
-               __pAccessibilityMonthElement->SetTrait(ACCESSIBILITY_TRAITS_MONTH);
+               __pAccessibilityMonthElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_MONTH_LC");
                __pAccessibilityMonthElement->SetHint(hintText);
 
                __pAccessibilityDayElement = new _AccessibilityElement(true);
                __pAccessibilityDayElement->SetBounds(dayBounds);
-               __pAccessibilityDayElement->SetTrait(ACCESSIBILITY_TRAITS_DAY);
+               __pAccessibilityDayElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_DAY_LC");
                __pAccessibilityDayElement->SetHint(hintText);
 
                _DateTimeUtils dateTimeUtils;

diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp
index 70468f1..888ce42 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTime.cpp
+++ b/src/ui/controls/FUiCtrl_EditTime.cpp
@@ -522,13 +522,13 @@ _EditTime::CreateAccessibilityElement(void)
 
                __pAccessibilityHourElement = new _AccessibilityElement(true);
                __pAccessibilityHourElement->SetBounds(hourBounds);
-               __pAccessibilityHourElement->SetTrait(ACCESSIBILITY_TRAITS_HOUR);
+               __pAccessibilityHourElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_HOUR_LC");
                __pAccessibilityHourElement->SetHint(hintText);
                pContainer->AddElement(*__pAccessibilityHourElement);
 
                __pAccessibilityMinuteElement = new _AccessibilityElement(true);
                __pAccessibilityMinuteElement->SetBounds(minuteBounds);
-               __pAccessibilityMinuteElement->SetTrait(ACCESSIBILITY_TRAITS_MINUTE);
+               __pAccessibilityMinuteElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_MINUTE_LC");
                __pAccessibilityMinuteElement->SetHint(hintText);
                pContainer->AddElement(*__pAccessibilityMinuteElement);
 
@@ -536,7 +536,7 @@ _EditTime::CreateAccessibilityElement(void)
                {
                        __pAccessibilityAmPmElement = new _AccessibilityElement(true);
                        __pAccessibilityAmPmElement->SetBounds(ampmBounds);
-                       __pAccessibilityAmPmElement->SetTrait(ACCESSIBILITY_TRAITS_BUTTON);
+                       __pAccessibilityAmPmElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                        pContainer->AddElement(*__pAccessibilityAmPmElement);
 
                        __pAccessibilityHourElement->SetBounds(FloatRectangle(hourBounds.x, ampmBounds.y, hourBounds.width, ampmBounds.height));
@@ -910,7 +910,7 @@ _EditTime::UpdateAccessibilityElement(void)
                        SysTryReturnVoidResult(NID_UI_CTRL, (__pAccessibilityAmPmElement != null), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
                        __pAccessibilityAmPmElement->SetBounds(ampmBounds);
-                       __pAccessibilityAmPmElement->SetTrait(ACCESSIBILITY_TRAITS_BUTTON);
+                       __pAccessibilityAmPmElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                        pContainer->AddElement(*__pAccessibilityAmPmElement);
 
                        __pAccessibilityHourElement->SetBounds(FloatRectangle(hourBounds.x, ampmBounds.y, hourBounds.width, ampmBounds.height));

diff --git a/src/ui/controls/FUiCtrl_Gallery.cpp b/src/ui/controls/FUiCtrl_Gallery.cpp
index 7d1b538..bafc6c7 100644 (file)
--- a/src/ui/controls/FUiCtrl_Gallery.cpp
+++ b/src/ui/controls/FUiCtrl_Gallery.cpp
@@ -688,7 +688,7 @@ _Gallery::AddGalleryAccessibilityElement(void)
                FloatRectangle floatRect = __pRenderer->GetCanvasImageBounds(__pPresenter->SearchCanvasIndex(GetCurrentItemIndex()));
                Rectangle rect(floatRect.x, floatRect.y, floatRect.width, floatRect.height);
                pGalleryElement->SetBounds(rect);
-               pGalleryElement->SetTrait(L"Image");
+               pGalleryElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_IMAGE");
                pGalleryElement->SetName(L"GalleryImage");
 
                pContainer->AddElement(*pGalleryElement);

diff --git a/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp b/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
index 925ce86..6e03651 100644 (file)
--- a/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
@@ -1524,7 +1524,6 @@ _GroupedListViewImpl::CheckEmptyListShowState(void)
 
                                SysTryReturnVoidResult(NID_UI_CTRL, (__pAccessibilityElement != null), E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-                               __pAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_NONE);
                                __pAccessibilityElement->SetName(L"ListView");
 
                                pContainer->RemoveAllElement();

diff --git a/src/ui/controls/FUiCtrl_IconListItem.cpp b/src/ui/controls/FUiCtrl_IconListItem.cpp
index aa5ccac..10672d7 100644 (file)
--- a/src/ui/controls/FUiCtrl_IconListItem.cpp
+++ b/src/ui/controls/FUiCtrl_IconListItem.cpp
@@ -1033,7 +1033,7 @@ _IconListItem::SetItemAccessibilityElement(FloatRectangle& rect, int itemIndex,
        if (__pAccessibilityElement == null)
        {
                __pAccessibilityElement = new (std::nothrow) _AccessibilityElement(true);
-               __pAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_IMAGE);
+               __pAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_IMAGE");
        }
 
        if (__pAccessibilityElement != null && itemIndex >= 0)
@@ -1044,7 +1044,10 @@ _IconListItem::SetItemAccessibilityElement(FloatRectangle& rect, int itemIndex,
                }
 
                __pAccessibilityElement->Activate(true);
-               __pAccessibilityElement->SetValue(IsChecked() ? L"selected" : L"");
+               if(IsChecked())
+               {
+               __pAccessibilityElement->SetValueWithStringId("IDS_TPLATFORM_BODY_SELECTED_T_TTS");
+               }
                __pAccessibilityElement->SetName(L"IconListViewItem" + Integer::ToString(itemIndex + 1));
                __pAccessibilityElement->SetLabel(GetText());
                __pAccessibilityElement->SetBounds(rect);

diff --git a/src/ui/controls/FUiCtrl_Label.cpp b/src/ui/controls/FUiCtrl_Label.cpp
index db05f48..031b57d 100644 (file)
--- a/src/ui/controls/FUiCtrl_Label.cpp
+++ b/src/ui/controls/FUiCtrl_Label.cpp
@@ -180,7 +180,6 @@ _Label::InitializeAccessibilityElement(void)
        SysTryReturnVoidResult(NID_UI_CTRL, __pTextElement, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
        __pTextElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width, GetBoundsF().height));
        __pTextElement->SetLabel(GetText());
-       __pTextElement->SetTrait(ACCESSIBILITY_TRAITS_LABEL);
        __pTextElement->SetName(L"LabelText");
 
                pContainer->AddElement(*__pTextElement);

diff --git a/src/ui/controls/FUiCtrl_ListViewImpl.cpp b/src/ui/controls/FUiCtrl_ListViewImpl.cpp
index d9af992..ae0ee45 100644 (file)
--- a/src/ui/controls/FUiCtrl_ListViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ListViewImpl.cpp
@@ -1359,7 +1359,6 @@ _ListViewImpl::CheckEmptyListShowState(void)
 
                                SysTryReturnVoidResult(NID_UI_CTRL, (__pAccessibilityElement != null), E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-                               __pAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_NONE);
                                __pAccessibilityElement->SetName(L"ListView");
 
                                pContainer->RemoveAllElement();

diff --git a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
index 0f88d53..db805bd 100644 (file)
--- a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
@@ -1025,7 +1025,6 @@ _MessageBoxPresenter::InitializeAccessibilityElement(void)
 
                pElementMessageBox->SetSupportOperatingGesture(false);
                pElementMessageBox->SetName(L"MessageBox");
-               pElementMessageBox->SetTrait(L"MessageBox");
                pElementMessageBox->SetHint(L"double tap to close");
                pElementMessageBox->SetBounds(FloatRectangle(0.0f, 0.0f, __pMessageBox->GetBoundsF().width, __pMessageBox->GetBoundsF().height));
                pContainer->AddElement(*pElementMessageBox);

diff --git a/src/ui/controls/FUiCtrl_Progress.cpp b/src/ui/controls/FUiCtrl_Progress.cpp
index 34c8ffa..39d76f8 100644 (file)
--- a/src/ui/controls/FUiCtrl_Progress.cpp
+++ b/src/ui/controls/FUiCtrl_Progress.cpp
@@ -121,8 +121,9 @@ _Progress::InitializeAccessibilityElement(void)
                __pAccessibilityElement->SetLabel(L"Progressing");
 
                String string;
-               string.Append(GetPercentComplete());
-               __pAccessibilityElement->SetValue(string + L" percent");
+               GET_STRING_CONFIG(IDS_TPLATFORM_BODY_PD_PERCENT_T_TTS, string);
+               string.Insert(GetPercentComplete(), 0);
+               __pAccessibilityElement->SetValue(string);
 
                r = pContainer->AddElement(*__pAccessibilityElement);
                SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -175,8 +176,9 @@ _Progress::SetPropertyValue(const Variant& value)
        if (__pAccessibilityElement)
        {
                String string;
-               string.Append(GetPercentComplete());
-               __pAccessibilityElement->SetValue(string + L" percent");
+               GET_STRING_CONFIG(IDS_TPLATFORM_BODY_PD_PERCENT_T_TTS, string);
+               string.Insert(GetPercentComplete(), 0);
+               __pAccessibilityElement->SetValue(string);
        }
 
        return r;
@@ -236,8 +238,9 @@ _Progress::SetRange(int minValue, int maxValue)
        if (__pAccessibilityElement)
        {
                String string;
-               string.Append(GetPercentComplete());
-               __pAccessibilityElement->SetValue(string + L" percent");
+               GET_STRING_CONFIG(IDS_TPLATFORM_BODY_PD_PERCENT_T_TTS, string);
+               string.Insert(GetPercentComplete(), 0);
+               __pAccessibilityElement->SetValue(string);
        }
 
        return r;

diff --git a/src/ui/controls/FUiCtrl_Slider.cpp b/src/ui/controls/FUiCtrl_Slider.cpp
index 35e71d6..a187c71 100644 (file)
--- a/src/ui/controls/FUiCtrl_Slider.cpp
+++ b/src/ui/controls/FUiCtrl_Slider.cpp
@@ -20,6 +20,7 @@
  * @brief      This is the implementation file for the _Slider class.
  */
 
+#include <stdio.h>
 #include <FBaseSysLog.h>
 #include <FBaseErrorDefine.h>
 #include <FGrp_BitmapImpl.h>
@@ -217,8 +218,8 @@ _Slider::InitializeAccessibilityElement(void)
                __pAccessibilityElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBounds().width, GetBounds().height));
                __pAccessibilityElement->SetLabel(__titleText);
                __pAccessibilityElement->SetName(L"SliderControl");
-               __pAccessibilityElement->SetTrait(L"Slider");
-               __pAccessibilityElement->SetHint(L"flick up and down to adjust");
+               __pAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_SLIDER_T_TTS");
+               __pAccessibilityElement->SetHintWithStringId("IDS_TPLATFORM_BODY_FLICK_UP_AND_DOWN_TO_ADJUST_THE_POSITION_T_TTS");
                SetAccessibilityElementValue();
                r = pContainer->AddElement(*__pAccessibilityElement);
                SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -514,11 +515,15 @@ _Slider::SetAccessibilityElementValue()
 {
        if (__pAccessibilityElement)
        {
-               String string;
-               string.Append(__pSliderPresenter->GetValue());
-               string.Append(L" of ");
-               string.Append(__pSliderPresenter->GetMaxValue());
-               __pAccessibilityElement->SetValue(string);
+       String string;
+       GET_STRING_CONFIG(IDS_TPLATFORM_BODY_POSITION_P1SD_OF_P2SD_T_TTS, string);
+       char buffer[10] = {0,};
+       sprintf(buffer, "%d", GetValue());
+       string.Replace(L"%1$d", buffer);
+       memset(buffer, 0, 10);
+       sprintf(buffer, "%d", __pSliderPresenter->GetMaxValue());
+       string.Replace(L"%2$d", buffer);
+       __pAccessibilityElement->SetValue(string);
        }
 
        return;
@@ -909,11 +914,14 @@ _Slider::OnAccessibilityValueIncreased(const _AccessibilityContainer& control, c
 {
        SetValue(GetValue() + 1);
        String string;
-       string.Append(__pSliderPresenter->GetValue());
-       string.Append(L" of ");
-       string.Append(__pSliderPresenter->GetMaxValue());
+       GET_STRING_CONFIG(IDS_TPLATFORM_BODY_POSITION_P1SD_OF_P2SD_T_TTS, string);
+       char buffer[10] = {0,};
+       sprintf(buffer, "%d", GetValue());
+       string.Replace(L"%1$d", buffer);
+       memset(buffer, 0, 10);
+       sprintf(buffer, "%d", __pSliderPresenter->GetMaxValue());
+       string.Replace(L"%2$d", buffer);
        _AccessibilityManager::GetInstance()->ReadContent(string);
-
        Invalidate();
        return true;
 }
@@ -922,11 +930,14 @@ bool
 _Slider::OnAccessibilityValueDecreased(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        SetValue(GetValue() - 1);
-
        String string;
-       string.Append(__pSliderPresenter->GetValue());
-       string.Append(L" of ");
-       string.Append(__pSliderPresenter->GetMaxValue());
+       GET_STRING_CONFIG(IDS_TPLATFORM_BODY_POSITION_P1SD_OF_P2SD_T_TTS, string);
+       char buffer[10] = {0,};
+       sprintf(buffer, "%d", GetValue());
+       string.Replace(L"%1$d", buffer);
+       memset(buffer, 0, 10);
+       sprintf(buffer, "%d", __pSliderPresenter->GetMaxValue());
+       string.Replace(L"%2$d", buffer);
        _AccessibilityManager::GetInstance()->ReadContent(string);
 
        Invalidate();

diff --git a/src/ui/controls/FUiCtrl_Tab.cpp b/src/ui/controls/FUiCtrl_Tab.cpp
index 7e950d5..52a6679 100644 (file)
--- a/src/ui/controls/FUiCtrl_Tab.cpp
+++ b/src/ui/controls/FUiCtrl_Tab.cpp
@@ -1534,8 +1534,8 @@ _Tab::AddAccessibilityElement(const FloatRectangle& itemBounds, const String& it
        _AccessibilityElement* pAccessibilityElement = new (std::nothrow) _AccessibilityElement(true);
        SysTryReturnVoidResult(NID_UI_CTRL, pAccessibilityElement != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
-       pAccessibilityElement->SetTrait(L"Tab");
-       pAccessibilityElement->SetHint(L"double tap to move to content");
+       pAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_TAB_T_TTS");
+       pAccessibilityElement->SetHintWithStringId("IDS_TPLATFORM_BODY_DOUBLE_TAP_TO_MOVE_TO_CONTENT_T_TTS");
 
        if (GetStyle() != _TAB_STYLE_ICON)
        {
@@ -1544,7 +1544,7 @@ _Tab::AddAccessibilityElement(const FloatRectangle& itemBounds, const String& it
 
        if (status == _TABITEM_STATUS_SELECTED)
        {
-               pAccessibilityElement->SetStatus("Selected");
+               pAccessibilityElement->SetStatusWithStringId("IDS_TPLATFORM_BODY_SELECTED_T_TTS");
                pAccessibilityElement->SetHintDisabled(true);
        }
        else
@@ -1568,8 +1568,8 @@ _Tab::InsertAccessibilityElementAt(int index, const FloatRectangle& itemBounds,
        _AccessibilityElement* pAccessibilityElement = new (std::nothrow) _AccessibilityElement(true);
        SysTryReturnVoidResult(NID_UI_CTRL, pAccessibilityElement != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
-       pAccessibilityElement->SetTrait(L"Tab");
-       pAccessibilityElement->SetHint(L"double tap to move to content");
+       pAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_TAB_T_TTS");
+       pAccessibilityElement->SetHintWithStringId("IDS_TPLATFORM_BODY_DOUBLE_TAP_TO_MOVE_TO_CONTENT_T_TTS");
 
        if (GetStyle() != _TAB_STYLE_ICON)
        {
@@ -1578,7 +1578,7 @@ _Tab::InsertAccessibilityElementAt(int index, const FloatRectangle& itemBounds,
 
        if (status == _TABITEM_STATUS_SELECTED)
        {
-               pAccessibilityElement->SetStatus("Selected");
+               pAccessibilityElement->SetStatusWithStringId("IDS_TPLATFORM_BODY_SELECTED_T_TTS");
                pAccessibilityElement->SetHintDisabled(true);
        }
        else
@@ -1658,7 +1658,7 @@ _Tab::UpdateAccessibilityElement(void)
 
                                if (itemStatus == _TABITEM_STATUS_SELECTED)
                                {
-                                       pAccessibilityElement->SetStatus("Selected");
+                                       pAccessibilityElement->SetStatusWithStringId("IDS_TPLATFORM_BODY_SELECTED_T_TTS");
                                        pAccessibilityElement->SetHintDisabled(true);
                                }
                                else

diff --git a/src/ui/controls/FUiCtrl_TabBarPresenter.cpp b/src/ui/controls/FUiCtrl_TabBarPresenter.cpp
index 5eeef05..5153bd7 100644 (file)
--- a/src/ui/controls/FUiCtrl_TabBarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TabBarPresenter.cpp
@@ -361,7 +361,7 @@ _TabBarPresenter::SetItemSelected(int index)
        pElement = pItem->GetAccessibilityElement();
        if(pElement != null)
        {
-               pElement->SetStatus(L"Selected");
+               pElement->SetStatusWithStringId("IDS_TPLATFORM_BODY_SELECTED_T_TTS");
                pElement->SetHintDisabled(true);
        }
 
@@ -1002,7 +1002,7 @@ _TabBarPresenter::SetAllAccessibilityElement(void)
                                pElement->Construct(L"", FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f));
                                pElement->SetName(L"Category" + Integer::ToString(i + 1));
                                pElement->SetLabel(pItem->GetText());
-                               pElement->SetTrait(L"Category");
+                               pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_CATEGORY");
                                FloatRectangle itemBounds = pItem->GetBounds();
                                itemBounds.x += __sideMargin;
                                pElement->SetBounds(itemBounds);
@@ -1013,7 +1013,7 @@ _TabBarPresenter::SetAllAccessibilityElement(void)
                        {
                                pElement->SetName(L"Category" + Integer::ToString(i + 1));
                                pElement->SetLabel(pItem->GetText());
-                               pElement->SetTrait(L"Category");
+                               pElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_CATEGORY");
                                FloatRectangle itemBounds = pItem->GetBounds();
                                itemBounds.x += __sideMargin;
                                pElement->SetBounds(itemBounds);
@@ -1021,7 +1021,7 @@ _TabBarPresenter::SetAllAccessibilityElement(void)
 
                        if (pItem->GetStatus() != ITEM_STATUS_SELECTED)
                        {
-                               pElement->SetHint(L"Double tap to move to contents");
+                               pElement->SetHintWithStringId("IDS_TPLATFORM_BODY_DOUBLE_TAP_TO_MOVE_TO_CONTENT_T_TTS");
                        }
                }
        }

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 45db8b5..2ab24e2 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -2360,7 +2360,7 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire, bool adjust)
                _AccessibilityElement* pElement = __pItems.at(currentSelectedItemIndex)->GetAccessibilityContainer()->GetChildElement(0);
                if (pElement)
                {
-                       pElement->SetStatus(L"Selected");
+                       pElement->SetStatusWithStringId("IDS_TPLATFORM_BODY_SELECTED_T_TTS");
                        pElement->SetHintDisabled(true);
                }
 
@@ -2386,7 +2386,7 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire, bool adjust)
                _AccessibilityElement* pElement = __pItems.at(itemIndex)->GetAccessibilityContainer()->GetChildElement(0);
                if (pElement)
                {
-                       pElement->SetStatus(L"Selected");
+                       pElement->SetStatusWithStringId("IDS_TPLATFORM_BODY_SELECTED_T_TTS");
                        pElement->SetHintDisabled(true);
                }
        }
@@ -2724,7 +2724,7 @@ _Toolbar::SetTitleText(const String& text, HorizontalAlignment alignment)
 
                __pTitleTextElement->SetBounds(FloatRectangle(titleBounds.x, titleBounds.y, titleBounds.width, titleBounds.height + descriptionBounds.height));
        }
-       __pTitleTextElement->SetTrait(L"Title");
+       __pTitleTextElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_TITLE");
        __pTitleTextElement->SetName(L"HeaderTitleText");
 
        return r;
@@ -2973,16 +2973,16 @@ _Toolbar::AddAccessibilityElement(ToolbarButton position, _Button* pButton)
                if (position == BACK_BUTTON)
                {
                        pButtonElement->SetLabel("Back");
-                       pButtonElement->SetTrait("Button");
+                       pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                }
                else if (position == MENU_BUTTON)
                {
                        pButtonElement->SetLabel("Menu");
-                       pButtonElement->SetTrait("Button");
+                       pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                }
                else
                {
-                       pButtonElement->SetTrait(L"Button");
+                       pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                }
                FloatRectangle floatRect = GetButtonBoundsF(position);
                pButtonElement->SetBounds(FloatRectangle(0,floatRect.y, pButton->GetBoundsF().width, floatRect.height));
@@ -3057,7 +3057,7 @@ _Toolbar::AddAccessibilityElement(_Button* pButton)
                                || style == TOOLBAR_SEGMENTED || style == TOOLBAR_TAB_WITH_TITLE
                                || style == TOOLBAR_TAB)
                        {
-                               pElement->SetHint(L"Double tap to move to contents");
+                               pElement->SetHintWithStringId("IDS_TPLATFORM_BODY_DOUBLE_TAP_TO_MOVE_TO_CONTENT_T_TTS");
                                pButton->GetAccessibilityContainer()->AddListener(*__pAccessibilityListener);
                        }
                }
@@ -10053,7 +10053,7 @@ _Toolbar::SetHideButton(bool hideButton)
                if (pBackButtonElement)
                {
                        pBackButtonElement->SetLabel("Hide");
-                       pBackButtonElement->SetTrait("Button");
+                       pBackButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                }
        }
        else
@@ -10110,7 +10110,7 @@ _Toolbar::SetHideButton(bool hideButton)
                if (pBackButtonElement)
                {
                        pBackButtonElement->SetLabel("Back");
-                       pBackButtonElement->SetTrait("Button");
+                       pBackButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                }
        }
 

diff --git a/src/ui/inc/FUiCtrl_DateTimeBar.h b/src/ui/inc/FUiCtrl_DateTimeBar.h
index 419f285..14014d6 100644 (file)
--- a/src/ui/inc/FUiCtrl_DateTimeBar.h
+++ b/src/ui/inc/FUiCtrl_DateTimeBar.h
@@ -101,7 +101,7 @@ public:
        void InsertAccessibilityElementAt(int index, const Tizen::Graphics::FloatRectangle& itemBounds, const Tizen::Base::String& itemText);
        void RemoveAllAccessibilityElement(void);
        void RemoveAccessibilityElementAt(int index);
-       Tizen::Ui::AccessibilityTraits GetAccessibilityTraitValue();
+       const char* GetAccessibilityTraitValue() const;
        Tizen::Base::String GetMonthValue(int month) const;
        void SetFont(Tizen::Graphics::Font& pFont);
        void SetParentWindowBounds(Tizen::Graphics::FloatRectangle& parentWindowBounds);