From 1b46a3e75ed3a07f6366a024692c3fbdb6b538f4 Mon Sep 17 00:00:00 2001 From: Bumseung Cho Date: Fri, 10 May 2013 16:20:29 +0900 Subject: [PATCH] Accessibility Callback is renamed, And Remove logic is changed. Change-Id: Ibf3b7adc16deec113be08b141f139e7c3125dac0 Signed-off-by: Bumseung Cho --- .project | 17 +++++++++++++++++ src/ui/FUi_AccessibilityContainerImpl.cpp | 23 +++++++++++++++++------ src/ui/FUi_AccessibilityElement.cpp | 4 ---- src/ui/FUi_AccessibilityManager.cpp | 2 +- src/ui/controls/FUiCtrl_CheckButton.cpp | 2 +- src/ui/controls/FUiCtrl_DateTimeBar.cpp | 2 +- src/ui/controls/FUiCtrl_EditTime.cpp | 2 +- src/ui/controls/FUiCtrl_OverlayRegionImpl.cpp | 1 - src/ui/controls/FUiCtrl_ScrollPanel.cpp | 4 ++-- src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_Tab.cpp | 2 +- src/ui/controls/FUiCtrl_TabBar.cpp | 4 ++-- src/ui/controls/FUiCtrl_TabBarPresenter.cpp | 2 +- src/ui/controls/FUiCtrl_TableViewItem.cpp | 2 +- src/ui/controls/FUiCtrl_Toolbar.cpp | 2 +- src/ui/inc/FUiCtrl_ColorPicker.h | 2 +- src/ui/inc/FUiCtrl_DateTimeBar.h | 2 +- src/ui/inc/FUiCtrl_DateTimePicker.h | 2 +- src/ui/inc/FUiCtrl_EditTime.h | 2 +- src/ui/inc/FUiCtrl_ScrollPanel.h | 2 +- src/ui/inc/FUiCtrl_ScrollPanelPresenter.h | 2 +- src/ui/inc/FUiCtrl_Slider.h | 2 +- src/ui/inc/FUiCtrl_SplitPanel.h | 2 +- src/ui/inc/FUiCtrl_Tab.h | 2 +- src/ui/inc/FUiCtrl_TabBar.h | 2 +- src/ui/inc/FUiCtrl_TabBarPresenter.h | 2 +- src/ui/inc/FUiCtrl_TableViewItem.h | 2 +- src/ui/inc/FUi_AccessibilityContainerImpl.h | 2 +- src/ui/inc/FUi_IAccessibilityListener.h | 2 +- 29 files changed, 61 insertions(+), 38 deletions(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 0000000..becd39f --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + osp-uifw + + + + + + org.tizen.nativecpp.apichecker.core.builder + + + + + + org.tizen.nativecpp.apichecker.core.tizenCppNature + + diff --git a/src/ui/FUi_AccessibilityContainerImpl.cpp b/src/ui/FUi_AccessibilityContainerImpl.cpp index 60e63bb..fe7b991 100644 --- a/src/ui/FUi_AccessibilityContainerImpl.cpp +++ b/src/ui/FUi_AccessibilityContainerImpl.cpp @@ -205,11 +205,8 @@ _AccessibilityContainerImpl::RemoveElement(const _AccessibilityElementImpl& elem SysTryReturn(NID_UI, ControlCoreExists(__coreHandle), E_SYSTEM, E_SYSTEM,"[E_SYSTEM] A core of control is invalid."); AccessibilityElement* pElement = const_cast(&(element.GetPublic())); result r = __elementList.Remove(pElement); - if (r == E_SUCCESS) - { - const_cast<_AccessibilityElementImpl&>(element).GetCore().Activate(false); - delete pElement; - } + const_cast<_AccessibilityElementImpl&>(element).GetCore().Activate(false); + delete pElement; return r; } @@ -234,6 +231,20 @@ _AccessibilityContainerImpl::RemoveAllElement(void) } __elementList.RemoveAll(); } + if (__pCore) + { + LinkedListT<_AccessibilityElement*> list; + __pCore->GetElements(list); + int count = list.GetCount(); + for (int i = 0; i < count; i++) + { + _AccessibilityElement* pElement = null; + if (list.GetAt(i, pElement) == E_SUCCESS) + { + pElement->Activate(false); + } + } + } return r; } @@ -281,7 +292,7 @@ _AccessibilityContainerImpl::OnAccessibilityFocusMovedPrevious(const _Accessibil return true; } bool -_AccessibilityContainerImpl::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_AccessibilityContainerImpl::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { int count = __listenerList.GetCount(); if (count > 0) diff --git a/src/ui/FUi_AccessibilityElement.cpp b/src/ui/FUi_AccessibilityElement.cpp index 18d684c..17e9469 100644 --- a/src/ui/FUi_AccessibilityElement.cpp +++ b/src/ui/FUi_AccessibilityElement.cpp @@ -223,10 +223,6 @@ void _AccessibilityElement::Activate(bool enable) { __activated = enable; - if(enable == false) - { - __pUserData = null; - } } bool _AccessibilityElement::IsActivated(void) const diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp index 742889b..f7fb09b 100644 --- a/src/ui/FUi_AccessibilityManager.cpp +++ b/src/ui/FUi_AccessibilityManager.cpp @@ -1185,7 +1185,7 @@ _AccessibilityManager::OnFinishReading(const Tizen::Base::String& grammar) { if (__pTargetElement) { - pListener->OnAccessibilityReadedElement(*__pTargetContainer, *__pTargetElement); + pListener->OnAccessibilityReadElement(*__pTargetContainer, *__pTargetElement); } } } diff --git a/src/ui/controls/FUiCtrl_CheckButton.cpp b/src/ui/controls/FUiCtrl_CheckButton.cpp index 3333f18..7bb2a8e 100644 --- a/src/ui/controls/FUiCtrl_CheckButton.cpp +++ b/src/ui/controls/FUiCtrl_CheckButton.cpp @@ -52,7 +52,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityValueIncreased(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} diff --git a/src/ui/controls/FUiCtrl_DateTimeBar.cpp b/src/ui/controls/FUiCtrl_DateTimeBar.cpp index aef3090..2f9e913 100644 --- a/src/ui/controls/FUiCtrl_DateTimeBar.cpp +++ b/src/ui/controls/FUiCtrl_DateTimeBar.cpp @@ -669,7 +669,7 @@ _DateTimeBar::OnAccessibilityReadingElement(const _AccessibilityContainer& contr } bool -_DateTimeBar::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_DateTimeBar::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { return false; } diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp index fe45dab..9709d62 100644 --- a/src/ui/controls/FUiCtrl_EditTime.cpp +++ b/src/ui/controls/FUiCtrl_EditTime.cpp @@ -927,7 +927,7 @@ _EditTime::OnAccessibilityReadingElement(const _AccessibilityContainer& control, } bool -_EditTime::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_EditTime::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { return false; } diff --git a/src/ui/controls/FUiCtrl_OverlayRegionImpl.cpp b/src/ui/controls/FUiCtrl_OverlayRegionImpl.cpp index 4874414..38af41e 100644 --- a/src/ui/controls/FUiCtrl_OverlayRegionImpl.cpp +++ b/src/ui/controls/FUiCtrl_OverlayRegionImpl.cpp @@ -103,7 +103,6 @@ CheckFinalRect(Tizen::Graphics::Rectangle& userRect,Tizen::Graphics::Rectangle& return false; } - return true; } diff --git a/src/ui/controls/FUiCtrl_ScrollPanel.cpp b/src/ui/controls/FUiCtrl_ScrollPanel.cpp index 3800e56..9b09327 100644 --- a/src/ui/controls/FUiCtrl_ScrollPanel.cpp +++ b/src/ui/controls/FUiCtrl_ScrollPanel.cpp @@ -403,11 +403,11 @@ _ScrollPanel::OnAccessibilityReadingElement(const _AccessibilityContainer& contr return __pScrollPanelPresenter->OnAccessibilityReadingElement(control, element); } bool -_ScrollPanel::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_ScrollPanel::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { ClearLastResult(); - return __pScrollPanelPresenter->OnAccessibilityReadedElement(control, element); + return __pScrollPanelPresenter->OnAccessibilityReadElement(control, element); } bool diff --git a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp index e30b8ab..09d4103 100644 --- a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp @@ -1181,7 +1181,7 @@ _ScrollPanelPresenter::OnAccessibilityReadingElement(const _AccessibilityContain return false; } bool -_ScrollPanelPresenter::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_ScrollPanelPresenter::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { return false; } diff --git a/src/ui/controls/FUiCtrl_Tab.cpp b/src/ui/controls/FUiCtrl_Tab.cpp index a743702..64fce2d 100644 --- a/src/ui/controls/FUiCtrl_Tab.cpp +++ b/src/ui/controls/FUiCtrl_Tab.cpp @@ -1426,7 +1426,7 @@ _Tab::OnAccessibilityReadingElement(const _AccessibilityContainer& control, cons return false; } bool -_Tab::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_Tab::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { return false; } diff --git a/src/ui/controls/FUiCtrl_TabBar.cpp b/src/ui/controls/FUiCtrl_TabBar.cpp index edba251..e135318 100644 --- a/src/ui/controls/FUiCtrl_TabBar.cpp +++ b/src/ui/controls/FUiCtrl_TabBar.cpp @@ -581,9 +581,9 @@ _TabBar::OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& contro } bool -_TabBar::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_TabBar::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { - return __pTabBarPresenter->OnAccessibilityReadedElement(control, element); + return __pTabBarPresenter->OnAccessibilityReadElement(control, element); } bool diff --git a/src/ui/controls/FUiCtrl_TabBarPresenter.cpp b/src/ui/controls/FUiCtrl_TabBarPresenter.cpp index 86b3b26..4bcdd05 100644 --- a/src/ui/controls/FUiCtrl_TabBarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TabBarPresenter.cpp @@ -1029,7 +1029,7 @@ _TabBarPresenter::OnAccessibilityFocusMovedPrevious(const _AccessibilityContaine } bool -_TabBarPresenter::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_TabBarPresenter::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { return false; } diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp index c8b76de..8092d86 100644 --- a/src/ui/controls/FUiCtrl_TableViewItem.cpp +++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp @@ -4387,7 +4387,7 @@ _TableViewItem::OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& } bool -_TableViewItem::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) +_TableViewItem::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) { return false; } diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp index d1f3430..83ae6be 100644 --- a/src/ui/controls/FUiCtrl_Toolbar.cpp +++ b/src/ui/controls/FUiCtrl_Toolbar.cpp @@ -51,7 +51,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} virtual bool OnAccessibilityValueIncreased(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;} diff --git a/src/ui/inc/FUiCtrl_ColorPicker.h b/src/ui/inc/FUiCtrl_ColorPicker.h index 0a15fdc..6e1b1d5 100644 --- a/src/ui/inc/FUiCtrl_ColorPicker.h +++ b/src/ui/inc/FUiCtrl_ColorPicker.h @@ -133,7 +133,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} - virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} + virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} diff --git a/src/ui/inc/FUiCtrl_DateTimeBar.h b/src/ui/inc/FUiCtrl_DateTimeBar.h index 3933ab5..93ed06e 100644 --- a/src/ui/inc/FUiCtrl_DateTimeBar.h +++ b/src/ui/inc/FUiCtrl_DateTimeBar.h @@ -109,7 +109,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_DateTimePicker.h b/src/ui/inc/FUiCtrl_DateTimePicker.h index 010b3b5..68fe433 100644 --- a/src/ui/inc/FUiCtrl_DateTimePicker.h +++ b/src/ui/inc/FUiCtrl_DateTimePicker.h @@ -149,7 +149,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} - virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} + virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityValueIncreased(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} diff --git a/src/ui/inc/FUiCtrl_EditTime.h b/src/ui/inc/FUiCtrl_EditTime.h index 8ebac04..beddc06 100644 --- a/src/ui/inc/FUiCtrl_EditTime.h +++ b/src/ui/inc/FUiCtrl_EditTime.h @@ -126,7 +126,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); - virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); + virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_ScrollPanel.h b/src/ui/inc/FUiCtrl_ScrollPanel.h index 2b57cc3..141202c 100644 --- a/src/ui/inc/FUiCtrl_ScrollPanel.h +++ b/src/ui/inc/FUiCtrl_ScrollPanel.h @@ -122,7 +122,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_ScrollPanelPresenter.h b/src/ui/inc/FUiCtrl_ScrollPanelPresenter.h index fe91f2f..8ac41ec 100644 --- a/src/ui/inc/FUiCtrl_ScrollPanelPresenter.h +++ b/src/ui/inc/FUiCtrl_ScrollPanelPresenter.h @@ -90,7 +90,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_Slider.h b/src/ui/inc/FUiCtrl_Slider.h index d0e6065..8a406c4 100644 --- a/src/ui/inc/FUiCtrl_Slider.h +++ b/src/ui/inc/FUiCtrl_Slider.h @@ -140,7 +140,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} - virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} + virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} diff --git a/src/ui/inc/FUiCtrl_SplitPanel.h b/src/ui/inc/FUiCtrl_SplitPanel.h index 9ab6a56..7b801ff 100644 --- a/src/ui/inc/FUiCtrl_SplitPanel.h +++ b/src/ui/inc/FUiCtrl_SplitPanel.h @@ -98,7 +98,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} - virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} + virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;} diff --git a/src/ui/inc/FUiCtrl_Tab.h b/src/ui/inc/FUiCtrl_Tab.h index 7d1c351..c65ec4f 100644 --- a/src/ui/inc/FUiCtrl_Tab.h +++ b/src/ui/inc/FUiCtrl_Tab.h @@ -208,7 +208,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); - virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); + virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_TabBar.h b/src/ui/inc/FUiCtrl_TabBar.h index d574661..690f0b2 100644 --- a/src/ui/inc/FUiCtrl_TabBar.h +++ b/src/ui/inc/FUiCtrl_TabBar.h @@ -142,7 +142,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_TabBarPresenter.h b/src/ui/inc/FUiCtrl_TabBarPresenter.h index d636887..a5eda15 100644 --- a/src/ui/inc/FUiCtrl_TabBarPresenter.h +++ b/src/ui/inc/FUiCtrl_TabBarPresenter.h @@ -100,7 +100,7 @@ public: bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element); bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); - bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); + bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element); bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element); bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_TableViewItem.h b/src/ui/inc/FUiCtrl_TableViewItem.h index b81a833..6391bcd 100644 --- a/src/ui/inc/FUiCtrl_TableViewItem.h +++ b/src/ui/inc/FUiCtrl_TableViewItem.h @@ -283,7 +283,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUi_AccessibilityContainerImpl.h b/src/ui/inc/FUi_AccessibilityContainerImpl.h index 7a045c3..8af2a2f 100644 --- a/src/ui/inc/FUi_AccessibilityContainerImpl.h +++ b/src/ui/inc/FUi_AccessibilityContainerImpl.h @@ -84,7 +84,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element); virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUi_IAccessibilityListener.h b/src/ui/inc/FUi_IAccessibilityListener.h index 215d3b3..21ae3ae 100644 --- a/src/ui/inc/FUi_IAccessibilityListener.h +++ b/src/ui/inc/FUi_IAccessibilityListener.h @@ -38,7 +38,7 @@ public: virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0; virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0; virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0; - virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0; + virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0; virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0; virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0; virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0; -- 2.7.4