From d8b5776b067c9b849fc126dce6ca65aee07393bf Mon Sep 17 00:00:00 2001 From: Bumseung Cho Date: Thu, 25 Apr 2013 13:18:47 +0900 Subject: [PATCH] Double Touch move implementation is applied. Change-Id: I83d3009a1f22bc74b3cc031e3363933b6b4cb9f4 Signed-off-by: Bumseung Cho --- src/ui/FUi_AccessibilityContainer.cpp | 2 +- src/ui/FUi_AccessibilityElement.cpp | 5 +- src/ui/FUi_AccessibilityGesture.cpp | 2 +- src/ui/FUi_AccessibilityManager.cpp | 256 ++++++++++++++---------- src/ui/FUi_EcoreEvas.cpp | 21 +- src/ui/FUi_EflUiEventManager.cpp | 5 +- src/ui/FUi_ResourceManager.cpp | 5 + src/ui/controls/FUiCtrl_Animation.cpp | 21 +- src/ui/controls/FUiCtrl_DateTimeBar.cpp | 2 +- src/ui/controls/FUiCtrl_DateTimePresenter.cpp | 2 +- src/ui/controls/FUiCtrl_Edit.cpp | 8 +- src/ui/controls/FUiCtrl_Frame.cpp | 4 +- src/ui/controls/FUiCtrl_IconListPresenter.cpp | 5 - src/ui/controls/FUiCtrl_InputPad.cpp | 10 - src/ui/controls/FUiCtrl_ListViewItem.cpp | 10 - src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp | 9 +- src/ui/controls/FUiCtrl_OptionMenu.cpp | 40 ---- src/ui/controls/FUiCtrl_ProgressPopup.cpp | 4 +- src/ui/controls/FUiCtrl_Slider.cpp | 9 +- src/ui/controls/FUiCtrl_SplitPanel.cpp | 5 +- src/ui/controls/FUiCtrl_Tab.cpp | 23 +-- src/ui/controls/FUiCtrl_TabBarPresenter.cpp | 22 +- src/ui/controls/FUiCtrl_TabPresenter.cpp | 5 - src/ui/controls/FUiCtrl_TableViewItem.cpp | 7 +- src/ui/controls/FUiCtrl_TokenEdit.cpp | 6 +- src/ui/controls/FUiCtrl_Toolbar.cpp | 23 --- src/ui/inc/FUi_AccessibilityManager.h | 10 +- src/ui/inc/FUi_ResourceManager.h | 2 + 28 files changed, 233 insertions(+), 290 deletions(-) diff --git a/src/ui/FUi_AccessibilityContainer.cpp b/src/ui/FUi_AccessibilityContainer.cpp index 8881e38..e4aeeeb 100644 --- a/src/ui/FUi_AccessibilityContainer.cpp +++ b/src/ui/FUi_AccessibilityContainer.cpp @@ -187,7 +187,7 @@ _AccessibilityContainer::RemoveElement(const _AccessibilityElement& element) { delete pElement; } - _AccessibilityManager::GetInstance()->NeedRefreshItem(); + _AccessibilityManager::GetInstance()->NeedRefreshItem(); return r; } diff --git a/src/ui/FUi_AccessibilityElement.cpp b/src/ui/FUi_AccessibilityElement.cpp index 98698d5..8554051 100644 --- a/src/ui/FUi_AccessibilityElement.cpp +++ b/src/ui/FUi_AccessibilityElement.cpp @@ -223,9 +223,8 @@ void _AccessibilityElement::Activate(bool enable) { __activated = enable; - if(!enable) + if(enable == false) { - // __pParent->RemoveElement(*this); __pUserData = null; } } @@ -280,6 +279,7 @@ _AccessibilityElement::SetBounds(const FloatRectangle& bounds) { _AccessibilityManager::GetInstance()->RequestToDrawFocusUi(); } + _AccessibilityManager::GetInstance()->NeedRefreshItem(); } void @@ -290,6 +290,7 @@ _AccessibilityElement::SetBounds(const Tizen::Graphics::Rectangle& bounds) { _AccessibilityManager::GetInstance()->RequestToDrawFocusUi(); } + _AccessibilityManager::GetInstance()->NeedRefreshItem(); } FloatRectangle diff --git a/src/ui/FUi_AccessibilityGesture.cpp b/src/ui/FUi_AccessibilityGesture.cpp index f4691d4..a7d0d3d 100644 --- a/src/ui/FUi_AccessibilityGesture.cpp +++ b/src/ui/FUi_AccessibilityGesture.cpp @@ -153,7 +153,7 @@ _AccessibilityGesture::ProcessGesture(_AccessibilityGestureType type, float x, f x = CoordinateSystem::ConvertToLogicalX(x); y = CoordinateSystem::ConvertToLogicalY(y); //ConvertTouchPosition(type, x,y); - _AccessibilityManager::GetInstance()->ProcessGesture(type,Tizen::Graphics::FloatPoint(x, y), null); + _AccessibilityManager::GetInstance()->ProcessGesture(type,Tizen::Graphics::FloatPoint(x, y)); return true; } }} //Tizen::Ui diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp index 7ff4cad..fde5f2d 100644 --- a/src/ui/FUi_AccessibilityManager.cpp +++ b/src/ui/FUi_AccessibilityManager.cpp @@ -15,6 +15,7 @@ // limitations under the License. // #include +#include #include #include #include @@ -269,7 +270,7 @@ _AccessibilityManager::_AccessibilityManager(void) , __pReadingVe(null) , __pFocusVe(null) , __pPanningControl(null) - , __needRefreshItem(false) + , __needRefreshItem(false) { Initialize(); } @@ -472,9 +473,16 @@ _AccessibilityManager::OnStartReading(const Tizen::Base::String& grammar) void _AccessibilityManager::HidePopup(void) { - if (__pReadingVe) + if (__readingPopupParentHandle.IsValid()) + { + if (__pReadingVe) + { + __pReadingVe->Destroy(); + __pReadingVe = null; + } + } + else { - __pReadingVe->Destroy(); __pReadingVe = null; } pGuidePopupTimer->Stop(); @@ -498,32 +506,40 @@ _AccessibilityManager::ShowPopup(const String& content) EnrichedText* pText = null; Frame* pFrame = null; - if (__pReadingVe) - { - __pReadingVe->Destroy(); - __pReadingVe = null; - } - if (__pReadingVe == null) + if (__readingPopupParentHandle.IsValid()) { - pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame(); - - if (pFrame != null) + if (__pReadingVe) { - int accesibilityVisualElementLevel = 3000; - result r = E_SUCCESS; - VisualElement* pRootVe = _ControlManager::GetInstance()->GetTopVisibleWindow()->GetVisualElement(); - - __pReadingVe = new (std::nothrow) VisualElement(); - SysTryCatch(NID_UI, __pReadingVe, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation is failed"); - - 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); + __pReadingVe->Destroy(); + __pReadingVe = null; } } + else + { + __pReadingVe = null; + } + + pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame(); + + if (pFrame != null) + { + int accesibilityVisualElementLevel = 3000; + result r = E_SUCCESS; + _Window* pWindow = _ControlManager::GetInstance()->GetTopVisibleWindow(); + VisualElement* pRootVe = pWindow->GetVisualElement(); + + __pReadingVe = new (std::nothrow) VisualElement(); + SysTryCatch(NID_UI, __pReadingVe, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation is failed"); + + 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); + __readingPopupParentHandle = pWindow->GetHandle(); + } + if (__pReadingVe) { result r = E_SUCCESS; @@ -684,32 +700,39 @@ _AccessibilityManager::ShowPopup() { return; } - if (__pReadingVe) - { - __pReadingVe->Destroy(); - __pReadingVe = null; - } - if (__pReadingVe == null) - { - pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame(); - if (pFrame != null) + if (__readingPopupParentHandle.IsValid()) + { + if (__pReadingVe) { - int accesibilityVisualElementLevel = 3000; - result r = E_SUCCESS; - VisualElement* pRootVe = _ControlManager::GetInstance()->GetTopVisibleWindow()->GetVisualElement(); - - __pReadingVe = new (std::nothrow) VisualElement(); - SysTryCatch(NID_UI, __pReadingVe, , E_SYSTEM, "[E_SYSTEM] System error"); - - 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); + __pReadingVe->Destroy(); + __pReadingVe = null; } } + else + { + __pReadingVe = null; + } + + pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame(); + + if (pFrame != null) + { + int accesibilityVisualElementLevel = 3000; + result r = E_SUCCESS; + _Window* pWindow = _ControlManager::GetInstance()->GetTopVisibleWindow(); + VisualElement* pRootVe = pWindow->GetVisualElement(); + __readingPopupParentHandle = pWindow->GetHandle(); + __pReadingVe = new (std::nothrow) VisualElement(); + SysTryCatch(NID_UI, __pReadingVe, , E_SYSTEM, "[E_SYSTEM] System error"); + + 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); + } screen = _ControlManager::GetInstance()->GetScreenSizeF(); if (__pReadingVe) @@ -986,7 +1009,7 @@ _AccessibilityManager::ShowPopup() SysTryCatch(NID_UI, pElement != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation is failed"); FloatRectangle rect = __pTargetElement->GetBounds(); String rectString; - rectString.Format(40, L"x:%f, y:%f, w:%f, h:%f", rect.x, rect.y, rect.width, rect.height); + rectString.Format(40, L"x:%.1f, y:%.1f, w:%.1f, h:%.1f", rect.x, rect.y, rect.width, rect.height); r = pElement->Construct(rectString); SysTryCatch(NID_UI, r == E_SUCCESS, , E_SYSTEM, "System error for accessibility popup"); @@ -1013,7 +1036,7 @@ _AccessibilityManager::ShowPopup() SysTryCatch(NID_UI, pElement != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation is failed"); rect = __pTargetElement->GetAbsoluteBounds(); rectString.Clear(); - rectString.Format(40, L"x:%f, y:%f, w:%f, h:%f", rect.x, rect.y, rect.width, rect.height); + rectString.Format(40, L"x:%.1f, y:%.1f, w:%.1f, h:%.1f", rect.x, rect.y, rect.width, rect.height); r = pElement->Construct(rectString); SysTryCatch(NID_UI, r == E_SUCCESS, , E_SYSTEM, "System error for accessibility popup"); @@ -1144,7 +1167,7 @@ CATCH: void _AccessibilityManager::OnFinishReading(const Tizen::Base::String& grammar) { - if (__pReadingVe) + if (__pReadingVe) { __pReadingVe->SetShowState(false); } @@ -1181,14 +1204,20 @@ void _AccessibilityManager::AddContainer(const _AccessibilityContainer& container) { __containerList.Add(&const_cast<_AccessibilityContainer&>(container)); - SetGestureMode(MODE_TAP); + if(__mode == MODE_FOCUS_MOVE) + { + SetGestureMode(MODE_TAP); + } return; } void _AccessibilityManager::RemoveContainer(const _AccessibilityContainer& container) { __containerList.Remove(&const_cast<_AccessibilityContainer&>(container)); - SetGestureMode(MODE_TAP); + if(__mode == MODE_FOCUS_MOVE) + { + SetGestureMode(MODE_TAP); + } if (__pTargetContainer == &container) { __pTargetContainer = null; @@ -1227,12 +1256,12 @@ _AccessibilityManager::MakeList(void) } } }; - if ( !__needRefreshItem && GetGestureMode() == MODE_FOCUS_MOVE) + if ( !__needRefreshItem && GetGestureMode() == MODE_FOCUS_MOVE) { - __needRefreshItem = false; + __needRefreshItem = false; return; } - __needRefreshItem = false; + __needRefreshItem = false; result r = E_SUCCESS; int count = 0; _Control* pControl = null; @@ -1418,9 +1447,10 @@ _AccessibilityManager::MakeList(void) } _AccessibilityElement* pElement = null; - int fastScrollIndex = -1; - int listItemStartIndex = -1; - int listItemEndIndex = -1; + + Dimension screen = _ResourceManager::GetInstance()->GetLogicalScreenSizen(); + int margin = _ControlManager::GetInstance()->GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT ? screen.width : screen.height; + for (int i = 0 ; i < count ; i++) { r = __candidateList.GetAt(i, pElement); @@ -1433,33 +1463,14 @@ _AccessibilityManager::MakeList(void) __candidateList.Remove(pElement); __candidateList.InsertAt(pElement, 0); } - if (pElement->GetName() == L"ListViewItemText" ||pElement->GetName() == L"TableViewItem") - { - listItemEndIndex = i; - } - if (listItemStartIndex == -1 && (pElement->GetName() == L"ListViewItemText" ||pElement->GetName() == L"TableViewItem")) - { - listItemStartIndex = i; - } - if (fastScrollIndex == -1 && pElement->GetName() == L"FastScroll") - { - fastScrollIndex = i; - } - } - - if (listItemStartIndex != -1 && fastScrollIndex != -1) - { - if (fastScrollIndex > listItemStartIndex) + if (pElement->GetAbsoluteBounds().x + pElement->GetAbsoluteBounds().width <= 1.0 + || (int)(pElement->GetAbsoluteBounds().x) >= margin - 1) { - result r = __candidateList.GetAt(fastScrollIndex, pElement); - if (r == E_SUCCESS) - { - __candidateList.Remove(pElement); - __candidateList.InsertAt(pElement, listItemStartIndex); - } + __candidateList.Remove(pElement); + i--; + count--; } } - return; } void @@ -1499,6 +1510,7 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction) { return false; } + SysLog(NID_UI, "count ", count); result r = E_SUCCESS; int index = 0; _AccessibilityElement* pElement = null; @@ -1606,6 +1618,7 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction) else { + __pTargetElement = pElement; __pTargetContainer = pContainer; __targetControlHandle = pContainer->GetOwner().GetHandle(); @@ -1620,9 +1633,9 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction) _IAccessibilityListener* pListener = null; if (pListenerList->GetAt(i, pListener) == E_SUCCESS) { - pListener->OnAccessibilityFocusIn(*__pTargetContainer, *__pTargetElement); - DrawFocusUi(*__pTargetElement); - if (direction == _ACCESSIBILITY_FOCUS_DIRECTION_PREVIOUS) + pListener->OnAccessibilityFocusIn(*__pTargetContainer, *__pTargetElement); + DrawFocusUi(*__pTargetElement); + if (direction == _ACCESSIBILITY_FOCUS_DIRECTION_PREVIOUS) { pListener->OnAccessibilityFocusMovedPrevious(*__pTargetContainer, *__pTargetElement); } @@ -1634,13 +1647,12 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction) } } } - else - { - DrawFocusUi(*__pTargetElement); - } + else + { + DrawFocusUi(*__pTargetElement); + } delete pListenerList; pListenerList = null; - ReadElement(*pElement); } return true; @@ -1660,7 +1672,15 @@ _AccessibilityManager::RequestToDrawFocusUi() void _AccessibilityManager::RequestAutoReading(_AccessibilityAutoReadingMode mode) { - pAutoReadingTimer->Start(mode); + if(__screenReaderIsEnabled) + { + if (mode == _ACCESSIBILITY_AUTO_READING_MODE_RESET) + { + __pTitleElement = null; + return; + } + pAutoReadingTimer->Start(mode); + } } void @@ -1688,9 +1708,16 @@ _AccessibilityManager::SetGlobalFocusedElement(_AccessibilityElement& element) void _AccessibilityManager::EraseFocusUi(void) { - if (__pFocusVe) + if (__focusedControlHandle.IsValid()) + { + if (__pFocusVe) + { + __pFocusVe->Destroy(); + __pFocusVe = null; + } + } + else { - __pFocusVe->Destroy(); __pFocusVe = null; } } @@ -1710,6 +1737,10 @@ _AccessibilityManager::DrawFocusUi(const _AccessibilityElement& element) __pFocusVe = null; } } + else + { + __pFocusVe = null; + } result r = E_SUCCESS; _Control* pControl = &const_cast<_Control&>(pContainer->GetOwner()); @@ -1755,15 +1786,22 @@ _AccessibilityManager::DrawFocusUi(const _AccessibilityElement& element) return; CATCH: delete pCanvas; - if (__pFocusVe) + if (__focusedControlHandle.IsValid()) + { + if (__pFocusVe) + { + __pFocusVe->Destroy(); + __pFocusVe = null; + } + } + else { - __pFocusVe->Destroy(); __pFocusVe = null; } return; } bool -_AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const FloatPoint& point, const _TouchGestureDetector* pDetector) +_AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const FloatPoint& point) { switch(type) { @@ -1856,6 +1894,7 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa __pTargetContainer = pAccContainer; __targetControlHandle = pAccContainer->GetOwner().GetHandle(); __pTargetElement = pElement; + EraseFocusUi(); } else { @@ -1875,9 +1914,9 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa } } delete pList; - } - DrawFocusUi(*pElement); - ReadElement(*pElement); + } + DrawFocusUi(*pElement); + ReadElement(*pElement); } } break; @@ -1957,12 +1996,10 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa break; case _ACCESSIBILITY_GESTURE_TYPE_ONE_FINGER_LONGPRESS: - SetGestureMode(MODE_TAP); break; case _ACCESSIBILITY_GESTURE_TYPE_ONE_FINGER_PANNING_STARTED: case _ACCESSIBILITY_GESTURE_TYPE_ONE_FINGER_PANNING_CHANGED: case _ACCESSIBILITY_GESTURE_TYPE_ONE_FINGER_PANNING_FINISHED: - SetGestureMode(MODE_TAP); break; case _ACCESSIBILITY_GESTURE_TYPE_VALUE_INCREASED: { @@ -2034,9 +2071,13 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa } _UiTouchEvent pressedEvent(pControl->GetHandle(), _TouchInfo(0, _TOUCH_PRESSED, pt, false, 0)); - pressedEvent.SetAccessibilityEvent(true); + unsigned int pointId = 0; + pointId = _TouchManager::GetInstance()->GeneratePointId(0); _UiEventManager::GetInstance()->SendEvent(pressedEvent); __pPanningControl = pControl; + _UiTouchEvent movedEvent(__pPanningControl->GetHandle(), _TouchInfo(0, _TOUCH_MOVED, pt, false, 0)); + pointId = _TouchManager::GetInstance()->GetPointId(0); + _UiEventManager::GetInstance()->SendEvent(movedEvent); SetGestureMode(MODE_PANNING); } break; @@ -2044,11 +2085,13 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa { if (__pPanningControl == null || GetGestureMode() != MODE_PANNING) { + SetGestureMode(MODE_TAP); return false; } Point pt((int)point.x, (int)point.y); _UiTouchEvent movedEvent(__pPanningControl->GetHandle(), _TouchInfo(0, _TOUCH_MOVED, pt, false, 0)); - movedEvent.SetAccessibilityEvent(true); + unsigned int pointId = 0; + pointId = _TouchManager::GetInstance()->GetPointId(0); _UiEventManager::GetInstance()->SendEvent(movedEvent); } break; @@ -2056,18 +2099,19 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa { if (__pPanningControl == null || GetGestureMode() != MODE_PANNING) { + SetGestureMode(MODE_TAP); return false; } Point pt((int)point.x, (int)point.y); _UiTouchEvent releasedEvent(__pPanningControl->GetHandle(), _TouchInfo(0, _TOUCH_RELEASED, pt, false, 0)); - releasedEvent.SetAccessibilityEvent(true); + unsigned int pointId = 0; + pointId = _TouchManager::GetInstance()->GetPointId(0); _UiEventManager::GetInstance()->SendEvent(releasedEvent); __pPanningControl = null; SetGestureMode(MODE_TAP); } break; default: - SetGestureMode(MODE_TAP); break; } return true; @@ -2220,7 +2264,7 @@ _AccessibilityManager::GetGestureMode(void) void _AccessibilityManager::NeedRefreshItem(void) { - __needRefreshItem = true; + __needRefreshItem = true; } }} //Tizen::Ui diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp index 1cad76b..c8ada99 100644 --- a/src/ui/FUi_EcoreEvas.cpp +++ b/src/ui/FUi_EcoreEvas.cpp @@ -383,7 +383,7 @@ OnAccessibilitySettingMessageReceived(void* pData, int type, void* pEvent) Ecore_X_Event_Client_Message* pClientEvent = static_cast(pEvent); if (pClientEvent->message_type == __atomAccessibility) { - if((Eina_Bool)pClientEvent->data.l[0]) + if ((Eina_Bool)pClientEvent->data.l[0]) { _AccessibilitySystemSettingLoader::SetSystemSetting(L"AccessibilityActivationStatus", true); _AccessibilitySystemSettingLoader::SetSystemSetting(L"AccessibilityActivationStatus", true); @@ -447,7 +447,6 @@ OnClientMessageReceived(void* pData, int type, void* pEvent) 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) @@ -487,6 +486,24 @@ OnClientMessageReceived(void* pData, int type, void* pEvent) SysLog(NID_UI, "Accessibility action : value increased"); _AccessibilityGesture::ProcessGesture(_ACCESSIBILITY_GESTURE_TYPE_VALUE_INCREASED); } + else if ((unsigned int)pClientEvent->data.l[1] == ecore_x_atom_get("_E_MOD_SCREEN_READER_ACTION_SCROLL_")) + { + SysLog(NID_UI, "Accessibility action : scroll %d, %d, %d", pClientEvent->data.l[2], pClientEvent->data.l[3], pClientEvent->data.l[4]); + x = (Evas_Coord)pClientEvent->data.l[3]; + y = (Evas_Coord)pClientEvent->data.l[4]; + if (pClientEvent->data.l[2] == 0) + { + _AccessibilityGesture::ProcessGesture(_ACCESSIBILITY_GESTURE_TYPE_TWO_FINGER_PANNING_STARTED, x, y); + } + else if (pClientEvent->data.l[2] == 1) + { + _AccessibilityGesture::ProcessGesture(_ACCESSIBILITY_GESTURE_TYPE_TWO_FINGER_PANNING_CHANGED, x, y); + } + else if (pClientEvent->data.l[2] == 2) + { + _AccessibilityGesture::ProcessGesture(_ACCESSIBILITY_GESTURE_TYPE_TWO_FINGER_PANNING_FINISHED, x, y); + } + } else if ((unsigned int)pClientEvent->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_DOWN) { SysLog(NID_UI, "Accessibility action : value decreased"); diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp index fa98125..6532ce6 100644 --- a/src/ui/FUi_EflUiEventManager.cpp +++ b/src/ui/FUi_EflUiEventManager.cpp @@ -46,6 +46,7 @@ #include "FUiAnim_ControlVisualElement.h" #include "FUiAnim_RootVisualElement.h" #include "FUiAnim_EflLayer.h" +#include "FUi_AccessibilityManager.h" using namespace std; using namespace Tizen::Ui; @@ -1097,7 +1098,7 @@ OnWindowFocusIn(void* pData __UNUSED__, int type __UNUSED__, void* pEventInfo) } } } - + _AccessibilityManager::GetInstance()->RequestAutoReading(_ACCESSIBILITY_AUTO_READING_MODE_FIRST_ITEM); return ECORE_CALLBACK_PASS_ON; } @@ -1125,7 +1126,7 @@ OnWindowFocusOut(void* pData __UNUSED__, int type __UNUSED__, void* pEventInfo) } } } - + _AccessibilityManager::GetInstance()->RequestAutoReading(_ACCESSIBILITY_AUTO_READING_MODE_RESET); return ECORE_CALLBACK_PASS_ON; } diff --git a/src/ui/FUi_ResourceManager.cpp b/src/ui/FUi_ResourceManager.cpp index 08f7314..c3936ef 100644 --- a/src/ui/FUi_ResourceManager.cpp +++ b/src/ui/FUi_ResourceManager.cpp @@ -1634,4 +1634,9 @@ _ResourceManager::ResetFeedback(void) __feedbackAcquireCount = 0; __feedbackStatus = _RESOURCE_FEEDBACK_STATUS_INIT; } +Dimension +_ResourceManager::GetLogicalScreenSizen(void) +{ + return Dimension(__logicalWidth, __logicalHeight); +} }}//Tizen::Ui diff --git a/src/ui/controls/FUiCtrl_Animation.cpp b/src/ui/controls/FUiCtrl_Animation.cpp index 4f27c2e..d5680e2 100644 --- a/src/ui/controls/FUiCtrl_Animation.cpp +++ b/src/ui/controls/FUiCtrl_Animation.cpp @@ -137,20 +137,17 @@ _Animation::OnAttachedToMainTree(void) return E_SUCCESS; } - if (likely((_AccessibilityManager::IsActivated()))) - { - _AccessibilityContainer* pContainer = GetAccessibilityContainer(); + _AccessibilityContainer* pContainer = GetAccessibilityContainer(); - if (pContainer) + if (pContainer) + { + __pAccessibilityElement = new (std::nothrow) _AccessibilityElement(true); + if (__pAccessibilityElement) { - __pAccessibilityElement = new (std::nothrow) _AccessibilityElement(true); - if (__pAccessibilityElement) - { - __pAccessibilityElement->SetBounds(FloatRectangle(0, 0, GetBounds().width, GetBounds().height)); - __pAccessibilityElement->SetName(L"Animation"); - __pAccessibilityElement->SetTrait(L"Animation"); - pContainer->AddElement(*__pAccessibilityElement); - } + __pAccessibilityElement->SetBounds(FloatRectangle(0, 0, GetBounds().width, GetBounds().height)); + __pAccessibilityElement->SetName(L"Animation"); + __pAccessibilityElement->SetTrait(L"Animation"); + pContainer->AddElement(*__pAccessibilityElement); } } diff --git a/src/ui/controls/FUiCtrl_DateTimeBar.cpp b/src/ui/controls/FUiCtrl_DateTimeBar.cpp index a29ed35..bfc50f3 100644 --- a/src/ui/controls/FUiCtrl_DateTimeBar.cpp +++ b/src/ui/controls/FUiCtrl_DateTimeBar.cpp @@ -637,7 +637,7 @@ _DateTimeBar::RefreshItems(void) __pDateTimeBarPresenter->StartAnimationEffect(); - if (likely((_AccessibilityManager::IsActivated()))) + if (unlikely((_AccessibilityManager::IsActivated()))) { _AccessibilityElement* pAccessibilityElement = GetAccessibilityElementAt(__pDateTimeBarPresenter->GetSelectedItemIndex() - 1); diff --git a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp index 0147a5d..669802b 100644 --- a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp +++ b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp @@ -463,7 +463,7 @@ _DateTimePresenter::Draw(void) DrawPm(*pCanvas); } - if (likely(_AccessibilityManager::IsActivated())) + if (unlikely(_AccessibilityManager::IsActivated())) { SetAccessibilityElementText(); } diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp index e5c2db6..fe56767 100644 --- a/src/ui/controls/FUiCtrl_Edit.cpp +++ b/src/ui/controls/FUiCtrl_Edit.cpp @@ -476,7 +476,7 @@ _Edit::Initialize(int editStyle, InputStyle inputStyle, int limitLength, GroupSt __pTextAccessibilityElement = new _AccessibilityElement(true); __pTextAccessibilityElement->SetBounds(FloatRectangle(0.0f,0.0f, GetBoundsF().width, GetBoundsF().height)); __pTextAccessibilityElement->SetLabel(GetTitleText() + GetGuideText() + GetText()); - __pTextAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_TEXT_FIELD); + __pTextAccessibilityElement->SetTrait(L"Edit Field"); __pTextAccessibilityElement->SetName(L"EditText"); pEditAccessibilityContainer->AddElement(*__pTextAccessibilityElement); @@ -485,7 +485,7 @@ _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(ACCESSIBILITY_TRAITS_TEXT_FIELD); + __pClearButtonTextAccessibilityElement->SetTrait(L"Edit Field"); __pClearButtonTextAccessibilityElement->SetName(L"EditFieldClearButton"); pEditAccessibilityContainer->AddElement(*__pClearButtonTextAccessibilityElement); } @@ -1037,8 +1037,8 @@ _Edit::UpdateAccessibilityElement(EditAccessibilityElementType type) { __pClearButtonTextAccessibilityElement = new _AccessibilityElement(true); __pClearButtonTextAccessibilityElement->SetBounds(_pEditPresenter->GetClearIconBoundsF()); - __pClearButtonTextAccessibilityElement->SetLabel(L"all clear, button"); - __pClearButtonTextAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_TEXT_FIELD); + __pClearButtonTextAccessibilityElement->SetLabel(L"all clear"); + __pClearButtonTextAccessibilityElement->SetTrait(L"Button"); __pClearButtonTextAccessibilityElement->SetName(L"EditFieldClearButton"); pEditAccessibilityContainer->AddElement(*__pClearButtonTextAccessibilityElement); } diff --git a/src/ui/controls/FUiCtrl_Frame.cpp b/src/ui/controls/FUiCtrl_Frame.cpp index 6230426..3e154cc 100644 --- a/src/ui/controls/FUiCtrl_Frame.cpp +++ b/src/ui/controls/FUiCtrl_Frame.cpp @@ -40,6 +40,7 @@ #include "FUiAnim_VisualElement.h" #include "FUiAnim_RootVisualElement.h" #include "FUiAnim_EflLayer.h" +#include "FUi_AccessibilityManager.h" using namespace Tizen::App; using namespace Tizen::Ui::Animations; @@ -192,6 +193,7 @@ _Frame::OnActivated(void) { pCurrentForm->SetFocused(); } + _AccessibilityManager::GetInstance()->RequestAutoReading(_ACCESSIBILITY_AUTO_READING_MODE_FIRST_ITEM); } bool @@ -263,7 +265,7 @@ _Frame::OnFrameActivated(void) pForm->MoveOverlayRegion(true); } } - + // Fire Event. IEventArg* pArg = _FrameEvent::CreateFrameEventArgN(*this, _FRAME_STATUS_ACTIVATED); __pFrameEvent->Fire(*pArg); diff --git a/src/ui/controls/FUiCtrl_IconListPresenter.cpp b/src/ui/controls/FUiCtrl_IconListPresenter.cpp index a3e183c..6bdab7a 100644 --- a/src/ui/controls/FUiCtrl_IconListPresenter.cpp +++ b/src/ui/controls/FUiCtrl_IconListPresenter.cpp @@ -2455,11 +2455,6 @@ _IconListPresenter::AddAccessibilityElement(_IconListItem& item, const FloatRect void _IconListPresenter::RemoveAllAccessibilityElements(void) { - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - _AccessibilityContainer* pContainer = __pIconListView->GetAccessibilityContainer(); if (pContainer != null) { diff --git a/src/ui/controls/FUiCtrl_InputPad.cpp b/src/ui/controls/FUiCtrl_InputPad.cpp index da4688a..8e4be71 100644 --- a/src/ui/controls/FUiCtrl_InputPad.cpp +++ b/src/ui/controls/FUiCtrl_InputPad.cpp @@ -208,11 +208,6 @@ _InputPad::HasAccessibilityElement(void) void _InputPad::SetAllAccessibilityElement(void) { - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - _AccessibilityContainer* pContainer = GetAccessibilityContainer(); if (pContainer != null) { @@ -278,11 +273,6 @@ _InputPad::SetBoundsAllAccessibilityElement(void) void _InputPad::RemoveAllAccessibilityElement(void) { - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - _AccessibilityElement* pElement = null; while (HasAccessibilityElement() == true) { diff --git a/src/ui/controls/FUiCtrl_ListViewItem.cpp b/src/ui/controls/FUiCtrl_ListViewItem.cpp index bfeccb8..db2b71e 100644 --- a/src/ui/controls/FUiCtrl_ListViewItem.cpp +++ b/src/ui/controls/FUiCtrl_ListViewItem.cpp @@ -1932,11 +1932,6 @@ CompareAccessibilityElement(_ListViewItemElement* a, _ListViewItemElement* b) void _ListViewItem::SetAccessibilityElement(void) { - if (!_AccessibilityManager::IsActivated()) - { - return; - } - _AccessibilityContainer* pContainer = GetAccessibilityContainer(); if (pContainer != null) @@ -1962,11 +1957,6 @@ _ListViewItem::SetAccessibilityElement(void) void _ListViewItem::SetAccessibilityElementLabel(void) { - if (!_AccessibilityManager::IsActivated() || __pAccessibilityElement == null) - { - return; - } - _LinkedList <_ListViewItemElement*> accessibilityElementList; _LinkedList <_ListViewItemElement>::_Iterator iter; diff --git a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp index f650236..95d7842 100644 --- a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp +++ b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp @@ -977,11 +977,6 @@ _MessageBoxPresenter::OnAttachedToMainTree(void) result r = E_SUCCESS; _AccessibilityElement* pTitleTextAccessibility = null; - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return r; - } - pTitleTextAccessibility = __pMessageBox->GetTitleTextAccessibilityElement(); if ((pTitleTextAccessibility != null) && (__pTextAccessibilityElement != null)) { @@ -1001,7 +996,7 @@ _MessageBoxPresenter::OnAttachedToMainTree(void) pTitleTextAccessibility->Construct(L"MessageBoxTitleText", __titleBounds); pTitleTextAccessibility->SetLabel(__pMessageBox->GetTitleText()); - pTitleTextAccessibility->SetTrait(ACCESSIBILITY_TRAITS_TEXT_FIELD); + pTitleTextAccessibility->SetTrait(L"Popup Title"); pContainer->AddElement(*pTitleTextAccessibility); } @@ -1013,7 +1008,7 @@ _MessageBoxPresenter::OnAttachedToMainTree(void) __pTextAccessibilityElement->Construct(L"MessageBoxText", __textBounds); __pTextAccessibilityElement->SetLabel(__pMessageBox->GetText()); - __pTextAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_TEXT_FIELD); + __pTextAccessibilityElement->SetTrait(L"Popup body text"); pContainer->AddElement(*__pTextAccessibilityElement); } diff --git a/src/ui/controls/FUiCtrl_OptionMenu.cpp b/src/ui/controls/FUiCtrl_OptionMenu.cpp index a110e78..29ceff1 100644 --- a/src/ui/controls/FUiCtrl_OptionMenu.cpp +++ b/src/ui/controls/FUiCtrl_OptionMenu.cpp @@ -154,11 +154,6 @@ _OptionMenu::AddItem(const String& text, int actionId) { result r = __pOptionMenuPresenter->AddItem(text, actionId); - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return r; - } - if (r == E_SUCCESS) { _AccessibilityContainer* pContainer = GetAccessibilityContainer(); @@ -186,11 +181,6 @@ _OptionMenu::InsertItemAt(int mainIndex, const String& text, int actionId) { result r = __pOptionMenuPresenter->InsertItemAt(mainIndex, text, actionId); - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return r; - } - if (r == E_SUCCESS) { _AccessibilityContainer* pContainer = GetAccessibilityContainer(); @@ -218,11 +208,6 @@ _OptionMenu::SetItemAt(int mainIndex, const String& text, int actionId) { result r = __pOptionMenuPresenter->SetItemAt(mainIndex, text, actionId); - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return r; - } - if (r == E_SUCCESS) { _AccessibilityElement* pElement = GetAccessibilityElement(mainIndex); @@ -240,11 +225,6 @@ _OptionMenu::RemoveItemAt(int mainIndex) { result r = __pOptionMenuPresenter->RemoveItemAt(mainIndex); - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return r; - } - if (r == E_SUCCESS) { _AccessibilityContainer* pContainer = GetAccessibilityContainer(); @@ -447,19 +427,9 @@ _OptionMenu::DestroySubMenu(void) _AccessibilityElement* _OptionMenu::GetAccessibilityElement(int mainIndex) { - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return null; - } - _AccessibilityElement* pElement = null; result r = E_SUCCESS; - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return null; - } - r = __accessibilityElements.GetAt(mainIndex,pElement); SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), null, r, "[%s] Propagating.", GetErrorMessage(r)); return pElement; @@ -597,11 +567,6 @@ _OptionMenu::OnActionPerformed(const _Control& source, int actionId) void _OptionMenu::SetBoundsAllAccessibilityElement(void) { - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - _AccessibilityElement* pElement = null; IEnumeratorT<_AccessibilityElement*>* pEnumerator = __accessibilityElements.GetEnumeratorN(); int index = 0; @@ -619,11 +584,6 @@ _OptionMenu::SetBoundsAllAccessibilityElement(void) void _OptionMenu::RemoveAllAccessibilityElement(void) { - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - _AccessibilityElement* pElement = null; while (__accessibilityElements.GetCount() > 0) { diff --git a/src/ui/controls/FUiCtrl_ProgressPopup.cpp b/src/ui/controls/FUiCtrl_ProgressPopup.cpp index 740a4b7..e3c87a0 100644 --- a/src/ui/controls/FUiCtrl_ProgressPopup.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPopup.cpp @@ -614,7 +614,7 @@ _ProgressPopup::InitializeAccessibilityElement(void) _pTitleTextAccessibilityElement->Construct(L"ProgressPopupTitleText", __pProgressPopupPresenter->GetTitleBounds()); _pTitleTextAccessibilityElement->SetLabel(GetTitleText()); - _pTitleTextAccessibilityElement->SetTrait("Popup Title Text"); + _pTitleTextAccessibilityElement->SetTrait(L"Popup Title"); pContainer->AddElement(*_pTitleTextAccessibilityElement); } @@ -626,7 +626,7 @@ _ProgressPopup::InitializeAccessibilityElement(void) __pTextAccessibilityElement->Construct(L"ProgressPopupText", __pProgressPopupPresenter->GetTextBounds()); __pTextAccessibilityElement->SetLabel(GetText()); - __pTextAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_TEXT_FIELD); + __pTextAccessibilityElement->SetTrait(L"Popup body text"); pContainer->AddElement(*__pTextAccessibilityElement); } diff --git a/src/ui/controls/FUiCtrl_Slider.cpp b/src/ui/controls/FUiCtrl_Slider.cpp index 9cf09a0..774601b 100644 --- a/src/ui/controls/FUiCtrl_Slider.cpp +++ b/src/ui/controls/FUiCtrl_Slider.cpp @@ -65,13 +65,10 @@ _Slider::_Slider(void) __pBase->SetClipChildrenEnabled(false); } - if (likely((_AccessibilityManager::IsActivated()))) + _AccessibilityContainer* pContainer = GetAccessibilityContainer(); + if (pContainer) { - _AccessibilityContainer* pContainer = GetAccessibilityContainer(); - if (pContainer) - { - pContainer->Activate(true); - } + pContainer->Activate(true); } } diff --git a/src/ui/controls/FUiCtrl_SplitPanel.cpp b/src/ui/controls/FUiCtrl_SplitPanel.cpp index 6c654ad..c3bc550 100644 --- a/src/ui/controls/FUiCtrl_SplitPanel.cpp +++ b/src/ui/controls/FUiCtrl_SplitPanel.cpp @@ -114,10 +114,7 @@ _SplitPanel::CreateSplitPanelN(const FloatRectangle& rect, SplitPanelDividerStyl pSplitPanel->SetBackgroundColor(Color(0,0,0,0)); - if (likely(_AccessibilityManager::IsActivated()) && pSplitPanel->GetAccessibilityContainer()) - { - pSplitPanel->GetAccessibilityContainer()->Activate(true); - } + pSplitPanel->GetAccessibilityContainer()->Activate(true); return pSplitPanel; diff --git a/src/ui/controls/FUiCtrl_Tab.cpp b/src/ui/controls/FUiCtrl_Tab.cpp index a193734..1b419c8 100644 --- a/src/ui/controls/FUiCtrl_Tab.cpp +++ b/src/ui/controls/FUiCtrl_Tab.cpp @@ -1306,15 +1306,12 @@ _Tab::OnAttachedToMainTree(void) { _AccessibilityContainer* pContainer = null; - if (likely((_AccessibilityManager::IsActivated()))) - { - pContainer = GetAccessibilityContainer(); + pContainer = GetAccessibilityContainer(); - if (pContainer) - { - pContainer->Activate(true); - pContainer->AddListener(*this); - } + if (pContainer) + { + pContainer->Activate(true); + pContainer->AddListener(*this); } return E_SUCCESS; @@ -1337,11 +1334,6 @@ _Tab::OnFontInfoRequested(unsigned long& style, float& size) void _Tab::AddAccessibilityElement(const FloatRectangle& itemBounds, const String& itemText, _TabItemStatus status) { - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - _AccessibilityContainer* pContainer = GetAccessibilityContainer(); if (pContainer != null) @@ -1379,11 +1371,6 @@ _Tab::AddAccessibilityElement(const FloatRectangle& itemBounds, const String& it void _Tab::RemoveAllAccessibilityElement(void) { - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - _AccessibilityContainer* pContainer = GetAccessibilityContainer(); if (pContainer == null) diff --git a/src/ui/controls/FUiCtrl_TabBarPresenter.cpp b/src/ui/controls/FUiCtrl_TabBarPresenter.cpp index f0548da..78e9ff4 100644 --- a/src/ui/controls/FUiCtrl_TabBarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TabBarPresenter.cpp @@ -345,28 +345,22 @@ _TabBarPresenter::SetItemSelected(int index) result r = GetLastResult(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); pItem->SetStatus(ITEM_STATUS_NORMAL); - if(unlikely(_AccessibilityManager::IsActivated())) + _AccessibilityElement* pElement = pItem->GetAccessibilityElement(); + if(pElement != null) { - _AccessibilityElement* pElement = pItem->GetAccessibilityElement(); - if(pElement != null) - { - pElement->SetStatus(L""); - pElement->SetHintDisabled(false); - } + pElement->SetStatus(L""); + pElement->SetHintDisabled(false); } pItem = GetItemAt(index); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); pItem->SetStatus(ITEM_STATUS_SELECTED); - if(unlikely(_AccessibilityManager::IsActivated())) + pElement = pItem->GetAccessibilityElement(); + if(pElement != null) { - _AccessibilityElement* pElement = pItem->GetAccessibilityElement(); - if(pElement != null) - { - pElement->SetStatus(L"Selected"); - pElement->SetHintDisabled(true); - } + pElement->SetStatus(L"Selected"); + pElement->SetHintDisabled(true); } __pTabBarModel->SetSelectedItemIndex(index); diff --git a/src/ui/controls/FUiCtrl_TabPresenter.cpp b/src/ui/controls/FUiCtrl_TabPresenter.cpp index 55d36d9..c04ba10 100644 --- a/src/ui/controls/FUiCtrl_TabPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TabPresenter.cpp @@ -2871,11 +2871,6 @@ _TabPresenter::SetLastLoadedItemIndex() void _TabPresenter::RefreshAccessibilityElement(void) { - if (likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - __pTab->RemoveAllAccessibilityElement(); for (int index = 0; index < GetItemCount(); index++) diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp index 2b15835..30b51b5 100644 --- a/src/ui/controls/FUiCtrl_TableViewItem.cpp +++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp @@ -1214,7 +1214,7 @@ _TableViewItem::OnTouchPressed(const _Control& source, const _TouchInfo& touchin if (!IsIndividualSelectionEnabled(source)) { __itemSelected = true; - if(likely((_AccessibilityManager::IsActivated()))) + if(unlikely((_AccessibilityManager::IsActivated()))) { FireItemTouchPressed(); } @@ -4309,11 +4309,6 @@ _TableViewItem::GetAccessibilityElement(void) void _TableViewItem::SetAccessibilityElementLabel(void) { - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - String accessibilityLabel; int childControlCount = GetChildCount(); int groupIndex = -1; diff --git a/src/ui/controls/FUiCtrl_TokenEdit.cpp b/src/ui/controls/FUiCtrl_TokenEdit.cpp index 05c3aaa..db7f3cb 100644 --- a/src/ui/controls/FUiCtrl_TokenEdit.cpp +++ b/src/ui/controls/FUiCtrl_TokenEdit.cpp @@ -500,7 +500,7 @@ _TokenEdit::OnAttachedToMainTree(void) __pDescriptionTextAccessibilityElement = new (std::nothrow) _AccessibilityElement(true); if (__pDescriptionTextAccessibilityElement) { - __pDescriptionTextAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_TEXT_FIELD); + __pDescriptionTextAccessibilityElement->SetTrait(L"Edit field"); pContainer->AddElement(*__pDescriptionTextAccessibilityElement); } } @@ -510,14 +510,14 @@ _TokenEdit::OnAttachedToMainTree(void) __pHiddenTokenCountAccessibilityElement = new (std::nothrow) _AccessibilityElement(true); if (__pHiddenTokenCountAccessibilityElement) { - __pHiddenTokenCountAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_TEXT_FIELD); + __pHiddenTokenCountAccessibilityElement->SetTrait(L"Edit field"); pContainer->AddElement(*__pHiddenTokenCountAccessibilityElement); } __pExpandableButtonAccessibilityElement = new (std::nothrow) _AccessibilityElement(true); if (__pExpandableButtonAccessibilityElement) { - __pExpandableButtonAccessibilityElement->SetTrait(ACCESSIBILITY_TRAITS_EXPAND_BUTTON); + __pExpandableButtonAccessibilityElement->SetTrait(L"EXPAND BUTTON"); pContainer->AddElement(*__pExpandableButtonAccessibilityElement); } } diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp index 8f6d644..441fd6f 100644 --- a/src/ui/controls/FUiCtrl_Toolbar.cpp +++ b/src/ui/controls/FUiCtrl_Toolbar.cpp @@ -2531,11 +2531,6 @@ _Toolbar::SetTitleText(const String& text, HorizontalAlignment alignment) r = __pToolbarPresenter->SetTitleText(__titleText, __titleTextAlignment); - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return r ; - } - if (__pTitleTextElement == null) { __pTitleTextElement = new (std::nothrow) _AccessibilityElement(true); @@ -2766,10 +2761,6 @@ _Toolbar::OnAttachedToMainTree(void) void _Toolbar::AddAccessibilityElement(ToolbarButton position, _Button* pButton) { - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } String name = L""; switch(position) { @@ -2822,11 +2813,6 @@ _Toolbar::AddAccessibilityElement(ToolbarButton position, _Button* pButton) void _Toolbar::AddAccessibilityElement(_Button* pButton) { - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - _AccessibilityContainer* pContainer = GetAccessibilityContainer(); if(pContainer == null) { @@ -2906,11 +2892,6 @@ _Toolbar::OnBoundsChanged(void) { RearrangeItems(); - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } - if(__pTitleTextElement) { if( __descriptionText.IsEmpty()) @@ -2979,10 +2960,6 @@ _Toolbar::OnDraw(void) __pToolbarPresenter->Draw(); - if(likely(!(_AccessibilityManager::IsActivated()))) - { - return; - } if(__pTitleTextElement) { if( __descriptionText.IsEmpty()) diff --git a/src/ui/inc/FUi_AccessibilityManager.h b/src/ui/inc/FUi_AccessibilityManager.h index f42b2a2..43a9502 100644 --- a/src/ui/inc/FUi_AccessibilityManager.h +++ b/src/ui/inc/FUi_AccessibilityManager.h @@ -71,7 +71,8 @@ enum _AccessibilityAutoReadingMode { _ACCESSIBILITY_AUTO_READING_MODE_FIRST_ITEM_OF_CONTENTS = -1, _ACCESSIBILITY_AUTO_READING_MODE_FIRST_ITEM = 0, - _ACCESSIBILITY_AUTO_READING_MODE_CURRENT_FOCUS = 1 + _ACCESSIBILITY_AUTO_READING_MODE_CURRENT_FOCUS = 1, + _ACCESSIBILITY_AUTO_READING_MODE_RESET = 2 }; class _OSP_EXPORT_ _AccessibilityManager { @@ -94,7 +95,7 @@ public: void AddContainer(const _AccessibilityContainer& container); void RemoveContainer(const _AccessibilityContainer& container); - bool ProcessGesture(_AccessibilityGestureType type, const Tizen::Graphics::FloatPoint& point,const _TouchGestureDetector* pDetector = null); + bool ProcessGesture(_AccessibilityGestureType type, const Tizen::Graphics::FloatPoint& point); Tizen::Base::String GetCurrentGrammar(void); void OnChangedLocale(void); @@ -103,7 +104,7 @@ public: bool IsScreenReaderActivated(void); float GetLargeFontSize(void); - void NeedRefreshItem(void); + void NeedRefreshItem(void); void RequestToDrawFocusUi(void); void RequestAutoReading(_AccessibilityAutoReadingMode mode); @@ -156,10 +157,11 @@ private: GestureMode __mode; _ControlHandle __targetControlHandle; _ControlHandle __focusedControlHandle; + _ControlHandle __readingPopupParentHandle; Tizen::Ui::Animations::VisualElement* __pReadingVe; Tizen::Ui::Animations::VisualElement* __pFocusVe; _Control* __pPanningControl; - bool __needRefreshItem; + bool __needRefreshItem; static bool __screenReaderIsEnabled; };//class _AccessibilityManager }} //Tizen::Ui diff --git a/src/ui/inc/FUi_ResourceManager.h b/src/ui/inc/FUi_ResourceManager.h index 40b65ec..8f94038 100644 --- a/src/ui/inc/FUi_ResourceManager.h +++ b/src/ui/inc/FUi_ResourceManager.h @@ -184,6 +184,8 @@ public: void ReleaseFeedback(void); void ResetFeedback(void); + Tizen::Graphics::Dimension GetLogicalScreenSizen(void); + private: _ResourceManager(void); ~_ResourceManager(void); -- 2.7.4