[AT-SPI] Add Dali::AtspiAccessibility::StopReading()

Change-Id: Ifff55e0716c238c140e9da346e67c7cf44cd5711

diff --git a/dali/devel-api/adaptor-framework/accessibility-impl.h b/dali/devel-api/adaptor-framework/accessibility-impl.h
index 7b5d18c..7f1faae 100644 (file)
--- a/dali/devel-api/adaptor-framework/accessibility-impl.h
+++ b/dali/devel-api/adaptor-framework/accessibility-impl.h
@@ -247,6 +247,13 @@ struct DALI_ADAPTOR_API Bridge
   virtual void Resume() = 0;
 
   /**
+   * @brief Cancels anything screen-reader is reading / has queued to read
+   *
+   * @param alsoNonDiscardable whether to cancel non-discardable readings as well
+   */
+  virtual void StopReading(bool alsoNonDiscardable) = 0;
+
+  /**
    * @brief Get screen reader status.
    */
   virtual bool GetScreenReaderEnabled() = 0;

diff --git a/dali/devel-api/adaptor-framework/atspi-accessibility.cpp b/dali/devel-api/adaptor-framework/atspi-accessibility.cpp
index 1828477..7b36a94 100644 (file)
--- a/dali/devel-api/adaptor-framework/atspi-accessibility.cpp
+++ b/dali/devel-api/adaptor-framework/atspi-accessibility.cpp
@@ -34,6 +34,14 @@ void Dali::AtspiAccessibility::Resume()
   }
 }
 
+void Dali::AtspiAccessibility::StopReading(bool alsoNonDiscardable)
+{
+  if(auto bridge = Dali::Accessibility::Bridge::GetCurrentBridge())
+  {
+    bridge->StopReading(alsoNonDiscardable);
+  }
+}
+
 void Dali::AtspiAccessibility::Say(const std::string& text, bool discardable, std::function<void(std::string)> callback)
 {
   if(auto bridge = Dali::Accessibility::Bridge::GetCurrentBridge())

diff --git a/dali/devel-api/adaptor-framework/atspi-accessibility.h b/dali/devel-api/adaptor-framework/atspi-accessibility.h
index 6294e3a..6c703f8 100644 (file)
--- a/dali/devel-api/adaptor-framework/atspi-accessibility.h
+++ b/dali/devel-api/adaptor-framework/atspi-accessibility.h
@@ -50,6 +50,13 @@ DALI_ADAPTOR_API void Pause();
 DALI_ADAPTOR_API void Resume();
 
 /**
+ * @brief Cancels anything screen-reader is reading / has queued to read
+ *
+ * @param alsoNonDiscardable whether to cancel non-discardable readings as well
+ */
+DALI_ADAPTOR_API void StopReading(bool alsoNonDiscardable = false);
+
+/**
  * @brief Set ATSPI to be turned On or Off forcibly.
  *
  * @param[in] turnOn true to turn on, false to turn off.

diff --git a/dali/internal/accessibility/bridge/bridge-impl.cpp b/dali/internal/accessibility/bridge/bridge-impl.cpp
index b7b026f..35e84b7 100644 (file)
--- a/dali/internal/accessibility/bridge/bridge-impl.cpp
+++ b/dali/internal/accessibility/bridge/bridge-impl.cpp
@@ -152,6 +152,22 @@ public:
                                                                                         false);
   }
 
+  void StopReading(bool alsoNonDiscardable) override
+  {
+    if(!IsUp())
+    {
+      return;
+    }
+
+    directReadingClient.method<DBus::ValueOrError<void>(bool)>("StopReading").asyncCall([](DBus::ValueOrError<void> msg) {
+      if(!msg)
+      {
+        LOG() << "Direct reading command failed (" << msg.getError().message << ")";
+      }
+    },
+                                                                                        alsoNonDiscardable);
+  }
+
   void Say(const std::string& text, bool discardable, std::function<void(std::string)> callback) override
   {
     if(!IsUp())

diff --git a/dali/internal/accessibility/bridge/dummy-atspi.h b/dali/internal/accessibility/bridge/dummy-atspi.h
index 02b1d25..f47a33a 100644 (file)
--- a/dali/internal/accessibility/bridge/dummy-atspi.h
+++ b/dali/internal/accessibility/bridge/dummy-atspi.h
@@ -136,6 +136,10 @@ struct DummyBridge : Dali::Accessibility::Bridge
   {
   }
 
+  void StopReading(bool alsoNonDiscardable) override
+  {
+  }
+
   bool GetScreenReaderEnabled() override
   {
     return false;