1.Accessibility focus bug fix. 2. Assert has been removed.

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

diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp
index 86973e8..a12e4f3 100644 (file)
--- a/src/ui/FUi_AccessibilityManager.cpp
+++ b/src/ui/FUi_AccessibilityManager.cpp
@@ -419,7 +419,6 @@ _AccessibilityManager::ReadElement(_AccessibilityAutoReadingMode mode)
                return;
        }
        __pTitleElement = pElement;
-       pElement->GetParent()->SetCurrentFocusedElement(pElement);
        DrawFocusUi(*pElement);
        __pTargetContainer = pElement->GetParent();
        __pTargetElement = pElement;
@@ -1616,12 +1615,9 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                        delete pListenerList;
                        pListenerList = null;
                }
-               pContainer->SetCurrentFocusedElement(pElement);
 
                if (__pTargetContainer)
                {
-                       __pTargetContainer->SetCurrentFocusedElement(null);
-
                        pListenerList = __pTargetContainer->GetListenerListN();
                        if (pListenerList)
                        {
@@ -1641,7 +1637,7 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                                pListenerList = null;
                        }
                }
-
+               __pTargetContainer->SetCurrentFocusedElement(null);
                if (focusManaged)
                {
                        __pTargetElement = pElement;
@@ -1649,7 +1645,6 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                        __targetControlHandle = pContainer->GetOwner().GetHandle();
                        EraseFocusUi();
                }
-
                else
                {
 
@@ -1812,11 +1807,11 @@ _AccessibilityManager::DrawFocusUi(const _AccessibilityElement& element)
                                SysTryCatch(NID_UI, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] System error");
                        }
                }
-
+               
                __pFocusVe->SetShowState(true);
                delete pCanvas;
        }
-
+       pContainer ->SetCurrentFocusedElement(const_cast<_AccessibilityElement*>(&element));
        return;
 CATCH:
        delete pCanvas;
@@ -1930,7 +1925,7 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa
                                        delete pList;
                                }
                        }
-
+                       __pTargetContainer->SetCurrentFocusedElement(null);
                        if (pAccContainer->IsFocusManaged())
                        {
                                __pTargetContainer = pAccContainer;

diff --git a/src/ui/FUi_ResourceManager.cpp b/src/ui/FUi_ResourceManager.cpp
index be2ce02..af754e0 100644 (file)
--- a/src/ui/FUi_ResourceManager.cpp
+++ b/src/ui/FUi_ResourceManager.cpp
@@ -1072,7 +1072,7 @@ _ResourceManager::PlayFeedback(_ResourceFeedbackPattern pattern)
                feedback_error_e error = (feedback_error_e)feedback_initialize();
                if(error != FEEDBACK_ERROR_NONE)
                {
-                       SysAssert(0);
+                       SysLog(NID_UI, "It failed to initialize feedback module.");
                }
                __initializeFeedback = true;
        }