[Tizen][AT-SPI] Implement Value::GetValueText()

Change-Id: I9a2eb40aced763bc74542b5f8c448445089ed67c

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
index 2f8739b..ff95317 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
@@ -96,6 +96,7 @@ int utcDaliAccessibilityProgressBarGetSetCurrent(void)
   DALI_TEST_EQUALS( x->SetCurrent( 2.0 ), false, TEST_LOCATION );
   DALI_TEST_EQUALS( x->SetCurrent( 0.25 ), true, TEST_LOCATION );
   DALI_TEST_EQUALS( x->GetCurrent(), 0.25, TEST_LOCATION );
+  DALI_TEST_EQUALS( x->GetValueText().empty(), true, TEST_LOCATION ); // not implemented
 
   END_TEST;
 }
@@ -192,6 +193,7 @@ int utcDaliAccessibilityScrollBarGetSetCurrent(void)
   DALI_TEST_EQUALS( x->SetCurrent( 1000.0 ), false, TEST_LOCATION );
   DALI_TEST_EQUALS( x->SetCurrent( 50.0 ), false, TEST_LOCATION );
   DALI_TEST_EQUALS( x->GetCurrent(), 0.0, TEST_LOCATION );
+  DALI_TEST_EQUALS( x->GetValueText().empty(), true, TEST_LOCATION ); // not implemented
 
   END_TEST;
 }
@@ -247,6 +249,7 @@ int utcDaliAccessibilitySliderGetSetCurrent(void)
   DALI_TEST_EQUALS( x->SetCurrent( 2.0 ), false, TEST_LOCATION );
   DALI_TEST_EQUALS( x->SetCurrent( 0.25 ), true, TEST_LOCATION );
   DALI_TEST_EQUALS( x->GetCurrent(), 0.25, TEST_LOCATION );
+  DALI_TEST_EQUALS( x->GetValueText().empty(), true, TEST_LOCATION ); // not implemented
 
   const float MIN_BOUND = 0.0f;
   const float MAX_BOUND = 1.0f;

diff --git a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
index f98ece7..5c5e2db 100644 (file)
--- a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp
@@ -689,6 +689,11 @@ double ProgressBar::ProgressBarAccessible::GetCurrent() const
   return self.GetProperty(Toolkit::ProgressBar::Property::PROGRESS_VALUE).Get<float>();
 }
 
+std::string ProgressBar::ProgressBarAccessible::GetValueText() const
+{
+  return {}; // Text mode is not used at the moment
+}
+
 double ProgressBar::ProgressBarAccessible::GetMaximum() const
 {
   return DEFAULT_UPPER_BOUND;

diff --git a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
index 13c9cb3..f128859 100644 (file)
--- a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
+++ b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
@@ -287,6 +287,11 @@ protected:
     double GetCurrent() const override;
 
     /**
+     * @copydoc Dali::Accessibility::Value::GetValueText()
+     */
+    std::string GetValueText() const override;
+
+    /**
      * @copydoc Dali::Accessibility::Value::GetMaximum()
      */
     double GetMaximum() const override;

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index 88fdf6b..c7d80ba 100644 (file)
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -879,6 +879,11 @@ double ScrollBar::ScrollBarAccessible::GetCurrent() const
   return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyScrollPosition) : 0.0f;
 }
 
+std::string ScrollBar::ScrollBarAccessible::GetValueText() const
+{
+  return {}; // Text mode is not used at the moment
+}
+
 double ScrollBar::ScrollBarAccessible::GetMaximum() const
 {
   auto self = Toolkit::ScrollBar::DownCast(Self());

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
index 57def7f..f0a5b6f 100644 (file)
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
@@ -336,6 +336,11 @@ protected:
     double GetCurrent() const override;
 
     /**
+     * @copydoc Dali::Accessibility::Value::GetValueText()
+     */
+    std::string GetValueText() const override;
+
+    /**
      * @copydoc Dali::Accessibility::Value::GetMaximum()
      */
     double GetMaximum() const override;

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
index a48ddbe..4acad77 100644 (file)
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -1424,6 +1424,11 @@ double Slider::SliderAccessible::GetCurrent() const
   return self.GetProperty(Toolkit::Slider::Property::VALUE).Get<float>();
 }
 
+std::string Slider::SliderAccessible::GetValueText() const
+{
+  return {}; // Text mode is not used at the moment
+}
+
 double Slider::SliderAccessible::GetMaximum() const
 {
   auto self = Toolkit::Slider::DownCast(Self());

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.h b/dali-toolkit/internal/controls/slider/slider-impl.h
index 7bf3e2a..bed0efd 100644 (file)
--- a/dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/dali-toolkit/internal/controls/slider/slider-impl.h
@@ -771,6 +771,11 @@ protected:
     double GetCurrent() const override;
 
     /**
+     * @copydoc Dali::Accessibility::Value::GetValueText()
+     */
+    std::string GetValueText() const override;
+
+    /**
      * @copydoc Dali::Accessibility::Value::GetMaximum()
      */
     double GetMaximum() const override;