modify license, permission and remove ^M char

[platform/framework/native/uifw.git] / src / ui / FUi_AccessibilityManager.cpp

diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp
old mode 100755 (executable)
new mode 100644 (file)
index ce4f3a8..86cbb9a
--- a/src/ui/FUi_AccessibilityManager.cpp
+++ b/src/ui/FUi_AccessibilityManager.cpp
@@ -2,14 +2,14 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Apache License, Version 2.0 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://floralicense.org/license/
+//     http://www.apache.org/licenses/LICENSE-2.0/
 //
 // Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
+// distributed under the License is distributed on an ”AS IS” BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
@@ -513,6 +513,7 @@ _AccessibilityManager::ShowPopup(const String& content)
                        r = __pReadingVe->Construct();
                        SysTryCatch(NID_UI, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] System error");
                        __pReadingVe->SetName("Accessibility reading popup");
+                       __pReadingVe->SetImplicitAnimationEnabled(false);
                        _VisualElementImpl::GetInstance(*__pReadingVe)->SetZOrderGroup(accesibilityVisualElementLevel);
                        pRootVe->AttachChild(*__pReadingVe);
                }
@@ -694,6 +695,7 @@ _AccessibilityManager::ShowPopup()
                        r = __pReadingVe->Construct();
                        SysTryCatch(NID_UI, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] System error");
                        __pReadingVe->SetName("Accessibility reading popup");
+                       __pReadingVe->SetImplicitAnimationEnabled(false);
                        _VisualElementImpl::GetInstance(*__pReadingVe)->SetZOrderGroup(accesibilityVisualElementLevel);
                        pRootVe->AttachChild(*__pReadingVe);
                }
@@ -1557,7 +1559,7 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                        pListenerList = null;
                }
                pContainer->SetCurrentFocusedElement(pElement);
-               
+
                if (__pTargetContainer)
                {
                        __pTargetContainer->SetCurrentFocusedElement(null);
@@ -1581,7 +1583,7 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                                pListenerList = null;
                        }
                }
-               
+
                if (focusManaged)
                {
                        __pTargetElement = pElement;
@@ -1589,7 +1591,7 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                        __targetControlHandle = pContainer->GetOwner().GetHandle();
                        EraseFocusUi();
                }
-               
+
                else
                {
                        DrawFocusUi(*pElement);
@@ -1622,7 +1624,7 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                        }
                        delete pListenerList;
                        pListenerList = null;
-                       
+
                        ReadElement(*pElement);
                }
                return true;
@@ -1692,7 +1694,7 @@ _AccessibilityManager::DrawFocusUi(const _AccessibilityElement& element)
                        __pFocusVe = null;
                }
        }
-       
+
        result r = E_SUCCESS;
        _Control* pControl = &const_cast<_Control&>(pContainer->GetOwner());
        _VisualElement* pControlVe = pControl->GetVisualElement();
@@ -1989,7 +1991,7 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa
                                        ReadContent(L"Unavailable");
                                        return true;
                                }
-                               
+
                                LinkedListT<_IAccessibilityListener*>* pList = static_cast<LinkedListT<_IAccessibilityListener*>*>(__pTargetContainer->GetListenerListN());
                                if (pList != null)
                                {