Remove the indicator

Change-Id: I3416b8fdcccb205ca5c1546304d6a906d4476427

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 8cd215b1437827f99422ac9d536f9764e856757c..a4b0d877c14a912c3a0beb0977466a18adf87113 100644 (file)
--- 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 23200c089e02af59ad264c82c7124285b4e318ad..2044f1e3f017ed99de8f3ff2f2fd85b316ebf858 100644 (file)
--- 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 8880b316f90038adc57569513b6ad82dbbfe0277..aee1bc0ff176bd0e7f902c97f14a669f7c0ebdd8 100644 (file)
--- 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 69e924a2656fc68e128f758b410715b1cd9a9a28..f794170024b03dac2e6f05239c94a8cebd248701 100644 (file)
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
@@ -653,12 +653,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 79ab14d8925abde5f1f521b9ba57b1cbc4f2700e..e0d7b9acf96e80a85efe9f0848518e0e07ca58fc 100644 (file)
--- 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 <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
 
 // EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
 #include <dali/devel-api/adaptor-framework/singleton-service.h>
 
 // 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 e3903e38ab09b98e5f908f125c027d861aebd719..a8b2f8e371b4943f7654577c929eb3d72f371a48 100755 (executable)
--- 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).
    *