From 0070e9ca4e08996ac60bf9637e695b32ee72e713 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Mon, 25 Feb 2019 17:48:14 +0000 Subject: [PATCH] Remove the indicator Change-Id: I3416b8fdcccb205ca5c1546304d6a906d4476427 --- .../toolkit-accessibility-adaptor.cpp | 15 -------------- .../dali-toolkit/utc-Dali-AccessibilityManager.cpp | 24 ---------------------- .../accessibility-manager-impl.cpp | 13 ------------ .../accessibility-manager-impl.h | 6 ------ .../accessibility-manager.cpp | 3 +++ .../accessibility-manager/accessibility-manager.h | 1 + 6 files changed, 4 insertions(+), 58 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp index 8cd215b1..a4b0d87 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp @@ -88,7 +88,6 @@ public: bool HandleActionReadFromTopEvent(); bool HandleActionReadFromNextEvent(); bool HandleActionZoomEvent(); - bool HandleActionReadIndicatorInformationEvent(); bool HandleActionReadPauseResumeEvent(); bool HandleActionStartStopEvent(); @@ -385,15 +384,6 @@ bool AccessibilityAdaptor::HandleActionZoomEvent() return false; } -bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent() -{ - if( mActionHandler ) - { - return mActionHandler->AccessibilityActionReadIndicatorInformation(); - } - return false; -} - bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent() { if( mActionHandler ) @@ -590,11 +580,6 @@ bool AccessibilityAdaptor::HandleActionZoomEvent() return Internal::Adaptor::GetImplementation(*this).HandleActionZoomEvent(); } -bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent() -{ - return Internal::Adaptor::GetImplementation(*this).HandleActionReadIndicatorInformationEvent(); -} - bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent() { return Internal::Adaptor::GetImplementation(*this).HandleActionReadPauseResumeEvent(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp index 23200c0..2044f1e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp @@ -2131,30 +2131,6 @@ int UtcDaliAccessibilityManagerActionZoomSignalN(void) END_TEST; } -int UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalP(void) -{ - ToolkitTestApplication application; - tet_infoline( " UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalP" ); - - AccessibilityManagerSignalHandler callback; - - Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get(); - Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true ); - accAdaptor.HandleActionEnableEvent(); - - AccessibilityManager manager = AccessibilityManager::Get(); - DALI_TEST_CHECK( manager ); - - manager.ActionReadIndicatorInformationSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback ); - - Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get(); - accessibilityAdaptor.HandleActionReadIndicatorInformationEvent(); - - DALI_TEST_EQUALS( callback.GetCalls(), 1u, TEST_LOCATION ); - - END_TEST; -} - int UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalN(void) { ToolkitTestApplication application; diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp index 8880b31..aee1bc0 100644 --- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp +++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp @@ -1240,19 +1240,6 @@ bool AccessibilityManager::AccessibilityActionZoom() return ret; } -bool AccessibilityManager::AccessibilityActionReadIndicatorInformation() -{ - Dali::Toolkit::AccessibilityManager handle( this ); - if( !mActionReadIndicatorInformationSignal.Empty() ) - { - mActionReadIndicatorInformationSignal.Emit( handle ); - } - - // TODO: Read the information in the indicator - - return mIsAccessibilityTtsEnabled; -} - bool AccessibilityManager::AccessibilityActionReadPauseResume() { Dali::Toolkit::AccessibilityManager handle( this ); diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h index 69e924a..f794170 100644 --- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h +++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h @@ -654,12 +654,6 @@ private: virtual bool AccessibilityActionZoom(); /** - * Perform the accessibility action to read the information in the indicator (by two fingers triple tap). - * @return whether the accessibility action is performed or not. - */ - virtual bool AccessibilityActionReadIndicatorInformation(); - - /** * Perform the accessibility action to pause/resume the current read out (by two fingers single tap). * @return whether the accessibility action is performed or not. */ diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp index 79ab14d..e0d7b9a 100644 --- a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp +++ b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp @@ -19,6 +19,7 @@ #include // EXTERNAL INCLUDES +#include #include // INTERNAL INCLUDES @@ -323,6 +324,8 @@ AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::Actio AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadIndicatorInformationSignal() { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: ActionReadIndicatorInformationSignal is deprecated and will be removed from next release.\n" ); + return GetImpl(*this).ActionReadIndicatorInformationSignal(); } diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h index e3903e3..a8b2f8e 100755 --- a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h +++ b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h @@ -763,6 +763,7 @@ public: AccessibilityActionSignalType& ActionZoomSignal(); /** + * @DEPRECATED_1_4.9 * @brief This is emitted when accessibility action is received to read the information * in the indicator (by two fingers triple tap). * -- 2.7.4