Accessibility changes are applied. 1. The disable string is changed. 2. When osp...

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

diff --git a/src/ui/FUi_AccessibilityElement.cpp b/src/ui/FUi_AccessibilityElement.cpp
index 7b54454..f646cbe 100644 (file)
--- a/src/ui/FUi_AccessibilityElement.cpp
+++ b/src/ui/FUi_AccessibilityElement.cpp
@@ -267,7 +267,7 @@ _AccessibilityElement::GetReadingContents(void) const
        if(__pParent->GetEnableState() == false)
        {
                out += L", ";
-               out += L"unavailable";
+               out += L"disable";
        }
        const_cast<_AccessibilityElement*>(this)->__updateContents = false;
        return out;

diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp
index e868ccc..e16ba5f 100644 (file)
--- a/src/ui/FUi_EcoreEvas.cpp
+++ b/src/ui/FUi_EcoreEvas.cpp
@@ -401,12 +401,12 @@ OnClientMessageReceived(void* pData, int type, void* pEvent)
 {
        Ecore_X_Event_Client_Message* pClientEvent = static_cast<Ecore_X_Event_Client_Message*>(pEvent);
        SysTryReturn(NID_UI, pClientEvent, ECORE_CALLBACK_RENEW, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-
+       
+       _ControlManager* pControlManager = _ControlManager::GetInstance();
        if (pClientEvent->message_type == __atomRotateRootAngle)
        {
                int angle = pClientEvent->data.l[0];
 
-               _ControlManager* pControlManager = _ControlManager::GetInstance();
                SysTryReturn(NID_UI, pControlManager, ECORE_CALLBACK_RENEW, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
 
                pControlManager->OnWindowRotated(angle);
@@ -414,6 +414,31 @@ OnClientMessageReceived(void* pData, int type, void* pEvent)
 
        if (pClientEvent->message_type == ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL)
        {
+               bool bFind = false;
+               int winCount = pControlManager->GetWindowCount();
+               for (int i = 0; i < winCount; i++)
+               {
+                       _Window* pWindow = pControlManager->GetWindow(i);
+                       if (!pWindow)
+                       {
+                               continue;
+                       }
+
+                       Ecore_X_Window win = (Ecore_X_Window)pWindow->GetNativeHandle();
+
+                       if (win == (Ecore_X_Window)pClientEvent->data.l[0])
+                       {
+                               bFind = true;
+                               break;
+                       }
+               }
+
+               if (!bFind)
+               {
+                       return ECORE_CALLBACK_RENEW;
+               }
+
+               
                int x = 0;
                int y = 0;
                if ((unsigned int)pClientEvent->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_NEXT)