Merge "Accessbiility bug fix : 1. check button string, 2. auto reading fail." into...

diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp
index 7eee982..cc428fb 100755 (executable)
--- a/src/ui/FUi_AccessibilityManager.cpp
+++ b/src/ui/FUi_AccessibilityManager.cpp
@@ -127,6 +127,7 @@ public:
                if (__pAccessibilityManager->GetTtsStatus() != Tizen::Ui::ACCESSIBILITY_SCREEN_READER_STATUS_READY
                        && __pAccessibilityManager->GetTtsStatus() != Tizen::Ui::ACCESSIBILITY_SCREEN_READER_STATUS_PLAYING)
                {
+                       __start = false;
                        Start(__mode);
                        return;
                        SysLog(NID_UI, "AccessibilityManager::AutoReadingTimer is started again because tts is not initialized.");

diff --git a/src/ui/controls/FUiCtrl_CheckButton.cpp b/src/ui/controls/FUiCtrl_CheckButton.cpp
index b954394..16d237e 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButton.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButton.cpp
@@ -503,7 +503,7 @@ _CheckButton::UpdateAccessibilityElement(void)
                                }
                                __pDetailButtonElement->SetBounds(FloatRectangle(__pCheckButtonPresenter->GetDetailedButtonBoundsF()));
                                __pDetailButtonElement->SetLabel(L"More");
-                               __pDetailButtonElement->SetTrait(L"More Button");
+                               __pDetailButtonElement->SetTrait(L"Button");
                                __pDetailButtonElement->SetName(L"MoreButtonText");
                        }
                }
@@ -531,7 +531,7 @@ _CheckButton::UpdateAccessibilityElement(void)
                                }
                                __pDetailButtonElement->SetBounds(FloatRectangle(__pCheckButtonPresenter->GetDetailedButtonBoundsF()));
                                __pDetailButtonElement->SetLabel(L"More");
-                               __pDetailButtonElement->SetTrait(L"More Button");
+                               __pDetailButtonElement->SetTrait(L"Button");
                                __pDetailButtonElement->SetName(L"MoreButtonText");
                        }
                }
@@ -1609,7 +1609,8 @@ _CheckButton::UpdateAccessibilityCheckStatus(void)
                        }
                }
        }
-       else if (__checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF || __checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER)
+       else if (__checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF || __checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER
+               || __checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF_SLIDING || __checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF_SLIDING_WITH_DIVIDER)
        {
                if (__pButtonElement != null)
                {