Revert "[Tizen][ATSPI] Accessibility initial implementation" 61/177761/1
authordongsug.song <dongsug.song@samsung.com>
Thu, 3 May 2018 10:45:46 +0000 (19:45 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Thu, 3 May 2018 10:45:53 +0000 (19:45 +0900)
This reverts commit e5208b9110e3aa0fb53d4db1cd19408cc958bfbb.

Change-Id: I647375a1ebbe7625de508bccaaedf82319949da1

36 files changed:
dali-toolkit/devel-api/controls/control-devel.h [changed mode: 0755->0644]
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp [changed mode: 0755->0644]
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/button-impl.h
dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp [changed mode: 0644->0755]
dali-toolkit/internal/controls/control/control-data-impl.cpp [changed mode: 0755->0644]
dali-toolkit/internal/controls/control/control-data-impl.h [changed mode: 0755->0644]
dali-toolkit/internal/controls/image-view/image-view-impl.cpp [changed mode: 0644->0755]
dali-toolkit/internal/controls/popup/confirmation-popup-impl.cpp
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp [changed mode: 0644->0755]
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h [changed mode: 0644->0755]
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp [changed mode: 0644->0755]
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h [changed mode: 0644->0755]
dali-toolkit/internal/controls/slider/slider-impl.cpp [changed mode: 0644->0755]
dali-toolkit/internal/controls/slider/slider-impl.h [changed mode: 0644->0755]
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.h
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.h
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp [changed mode: 0755->0644]
dali-toolkit/internal/text/text-controller-impl.cpp
dali-toolkit/internal/text/text-controller-impl.h
dali-toolkit/internal/text/text-controller.cpp [changed mode: 0644->0755]
dali-toolkit/internal/text/text-controller.h [changed mode: 0644->0755]
dali-toolkit/public-api/controls/control-impl.cpp [changed mode: 0644->0755]
dali-toolkit/public-api/controls/control-impl.h
dali-toolkit/public-api/controls/control.cpp
dali-toolkit/public-api/controls/control.h [changed mode: 0755->0644]
dali-toolkit/public-api/controls/text-controls/text-field.h [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
index 8d6ce47..ae90f4d
@@ -113,10 +113,7 @@ enum
    * @details Name "downFocusableActorId", type Property::INTEGER.
    *
    */
-  DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7,
-
-  ACCESSIBILITY_ATTRIBUTES = PADDING + 8
-
+  DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7
 };
 
 } // namespace Property
index 9d87e96..84dd7a1 100644 (file)
@@ -1652,23 +1652,6 @@ Actor Button::GetSelectedImage() const
   return imageView;
 }
 
-std::string Button::AccessibleImpl::GetName()
-{
-  auto slf = Toolkit::Button::DownCast( self );
-  return slf.GetLabelText();
-}
-
-Dali::Accessibility::States Button::AccessibleImpl::CalculateStates()
-{
-  auto tmp = Control::AccessibleImpl::CalculateStates();
-  tmp[Dali::Accessibility::State::Selectable] = true;
-  auto slf = Toolkit::Button::DownCast( self );
-  tmp[Dali::Accessibility::State::Enabled] = !slf.IsDisabled();
-  if( slf.IsSelected() )
-    tmp[Dali::Accessibility::State::Checked] = true;
-  return tmp;
-}
-
 } // namespace Internal
 
 } // namespace Toolkit
index eafa843..8b1417c 100644 (file)
@@ -685,14 +685,6 @@ private:
   Image            mSetButtonImage;             ///< Store set image if deprecated SetButtonImage used.
   Image            mSetSelectedImage;           ///< Store set image if deprecated SetSelectedImage used.
 
-protected:
-  struct AccessibleImpl : public Control::AccessibleImpl
-  {
-    using Control::AccessibleImpl::AccessibleImpl;
-
-    Dali::Accessibility::States CalculateStates() override;
-    std::string GetName() override;
-  };
 };
 
 } // namespace Internal
index 9c666a5..9554ccb 100644 (file)
@@ -75,10 +75,6 @@ CheckBoxButton::CheckBoxButton()
 : Button()
 {
   SetTogglableButton( true );
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::CheckBox ) );
-  } );
 }
 
 CheckBoxButton::~CheckBoxButton()
index 2cfb8ab..1b7f495 100644 (file)
@@ -101,10 +101,6 @@ PushButton::PushButton()
 : Button(),
   mIconAlignment( RIGHT )
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::PushButton ) );
-  } );
 }
 
 PushButton::~PushButton()
index 0e8495f..bbd151a 100644 (file)
@@ -67,10 +67,6 @@ Dali::Toolkit::RadioButton RadioButton::New()
 RadioButton::RadioButton()
 {
   SetTogglableButton(true);
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::RadioButton ) );
-  } );
 }
 
 RadioButton::~RadioButton()
old mode 100644 (file)
new mode 100755 (executable)
index 7299e42..0ecae06
@@ -98,10 +98,6 @@ ToggleButton::ToggleButton()
 {
   DALI_LOG_INFO( gLogButtonFilter, Debug::General, "ToggleButton::Constructor\n" );
   SetTogglableButton( false );
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::ToggleButton ) );
-  } );
 }
 
 ToggleButton::~ToggleButton()
old mode 100755 (executable)
new mode 100644 (file)
index f9e316f..369c409
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/object/type-registry-helper.h>
-#include <dali/public-api/common/stage.h>
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali/public-api/object/object-registry.h>
-#include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali-toolkit/public-api/controls/control-impl.h>
 #include <cstring>
 #include <limits>
 
@@ -180,20 +175,13 @@ static bool DoAction( BaseObject* object, const std::string& actionName, const P
 {
   bool ret = false;
 
-  if( object &&
-      ( 0 == strcmp( actionName.c_str(), ACTION_ACCESSIBILITY_ACTIVATED ) ||
-        actionName == "activate" ) )
+  if( object && ( 0 == strcmp( actionName.c_str(), ACTION_ACCESSIBILITY_ACTIVATED ) ) )
   {
     Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
     if( control )
     {
       // if cast succeeds there is an implementation so no need to check
-      if (!Internal::GetImplementation( control ).AccessibilityActivateSignal().Empty()) {
-        Internal::GetImplementation( control ).AccessibilityActivateSignal().Emit();
-        ret = true;
-      }
-      else
-        ret = Internal::GetImplementation( control ).OnAccessibilityActivated();
+      ret = Internal::GetImplementation( control ).OnAccessibilityActivated();
     }
   }
 
@@ -283,9 +271,7 @@ SignalConnectorType registerSignal5( typeRegistration, SIGNAL_PANNED, &DoConnect
 SignalConnectorType registerSignal6( typeRegistration, SIGNAL_PINCHED, &DoConnectSignal );
 SignalConnectorType registerSignal7( typeRegistration, SIGNAL_LONG_PRESSED, &DoConnectSignal );
 
-TypeAction registerAction( typeRegistration, "activate", &DoAction );
-TypeAction registerAction2( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED,
-                            &DoAction );
+TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &DoAction );
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -325,7 +311,6 @@ const PropertyRegistration Control::Impl::PROPERTY_11( typeRegistration, "leftFo
 const PropertyRegistration Control::Impl::PROPERTY_12( typeRegistration, "rightFocusableActorId", Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID,Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
 const PropertyRegistration Control::Impl::PROPERTY_13( typeRegistration, "upFocusableActorId",    Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID,   Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
 const PropertyRegistration Control::Impl::PROPERTY_14( typeRegistration, "downFocusableActorId",  Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_15( typeRegistration, "accessibilityAttributes", Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
 
 
 Control::Impl::Impl( Control& controlImpl )
@@ -353,10 +338,7 @@ Control::Impl::Impl( Control& controlImpl )
   mIsKeyboardNavigationSupported( false ),
   mIsKeyboardFocusGroup( false )
 {
-  Dali::Accessibility::Accessible::RegisterControlAccessibilityGetter(
-      []( Dali::Actor actor ) -> Dali::Accessibility::Accessible* {
-        return Control::GetAccessibilityObject( actor );
-      } );
+
 }
 
 Control::Impl::~Impl()
@@ -810,16 +792,6 @@ void Control::Impl::DoAction( Dali::Property::Index visualIndex, Dali::Property:
   }
 }
 
-void Control::Impl::AccessibilitySetAttribute( const std::string& key,
-                                               const std::string value )
-{
-  Property::Value* val = mAccessibilityAttributes.Find( key );
-  if( val )
-    mAccessibilityAttributes[key] = Property::Value( value );
-  else
-    mAccessibilityAttributes.Insert( key, value );
-}
-
 void Control::Impl::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
 {
   Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
@@ -1010,26 +982,10 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons
         break;
       }
 
-      case Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES:
-      {
-        value.Get( controlImpl.mImpl->mAccessibilityAttributes );
-        break;
-      }
     }
   }
 }
 
-std::string Control::Impl::AccessibilityGetAttribute( const std::string& key )
-{
-  std::string value;
-  auto place = mAccessibilityAttributes.Find( key );
-  if( !place )
-    return "";
-  if( !place->Get( value ) )
-    return "";
-  return value;
-}
-
 Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index index )
 {
   Property::Value value;
@@ -1145,24 +1101,12 @@ Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index
         value = map;
         break;
       }
-
-      case Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES:
-      {
-        value = controlImpl.mImpl->mAccessibilityAttributes;
-        break;
-      }
     }
   }
 
   return value;
 }
 
-void Control::Impl::AccessibilityEraseAttribute( std::string& key )
-{
-  Property::Value* val = mAccessibilityAttributes.Find( key );
-  if( val )
-    mAccessibilityAttributes[key] = Property::Value();
-}
 
 void  Control::Impl::CopyInstancedProperties( RegisteredVisualContainer& visuals, Dictionary<Property::Map>& instancedProperties )
 {
old mode 100755 (executable)
new mode 100644 (file)
index f9c3099..ddd7506
@@ -32,9 +32,6 @@
 #include <dali-toolkit/internal/builder/style.h>
 #include <dali-toolkit/internal/builder/dictionary.h>
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
-#include <dali/devel-api/common/owner-container.h>
-#include <dali/integration-api/debug.h>
-#include <memory>
 
 namespace Dali
 {
@@ -303,11 +300,6 @@ public:
    */
   Extents GetPadding() const;
 
-  void AccessibilitySetAttribute( const std::string& key,
-                                  const std::string value );
-  std::string AccessibilityGetAttribute( const std::string& key );
-  void AccessibilityEraseAttribute( std::string& key );
-
 private:
 
   /**
@@ -352,7 +344,6 @@ public:
   Control& mControlImpl;
   DevelControl::State mState;
   std::string mSubStateName;
-  Property::Map mAccessibilityAttributes;
 
   int mLeftFocusableActorId;       ///< Actor ID of Left focusable control.
   int mRightFocusableActorId;      ///< Actor ID of Right focusable control.
@@ -369,7 +360,6 @@ public:
   Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusGainedSignal;
   Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusLostSignal;
   Toolkit::Control::ResourceReadySignalType mResourceReadySignal;
-  Toolkit::Control::AccessibilityActivateSignalType mAccessibilityActivateSignal;
 
   // Gesture Detection
   PinchGestureDetector mPinchGestureDetector;
@@ -401,11 +391,6 @@ public:
   static const PropertyRegistration PROPERTY_12;
   static const PropertyRegistration PROPERTY_13;
   static const PropertyRegistration PROPERTY_14;
-  static const PropertyRegistration PROPERTY_15;
-
-  std::function< std::unique_ptr< Dali::Accessibility::Accessible >( Actor ) >
-      accessibilityConstructor;
-  std::unique_ptr< Dali::Accessibility::Accessible > accessibilityObject;
 };
 
 
old mode 100644 (file)
new mode 100755 (executable)
index 3a9cd53..8bfa80d
@@ -66,10 +66,6 @@ using namespace Dali;
 ImageView::ImageView()
 : Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) )
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::Image ) );
-  } );
 }
 
 ImageView::~ImageView()
index 9850ee1..43758cb 100644 (file)
@@ -99,10 +99,6 @@ ConfirmationPopup::ConfirmationPopup()
   mControlSignals.reserve( MAXIMUM_NUMBER_OF_CONTROLS );
   mControlSignalNames[ Toolkit::ConfirmationPopup::CONTROL_OK ] = DEFAULT_CONNECT_SIGNAL_NAME;
   mControlSignalNames[ Toolkit::ConfirmationPopup::CONTROL_CANCEL ] = DEFAULT_CONNECT_SIGNAL_NAME;
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::Dialog, true ) );
-  } );
 }
 
 ConfirmationPopup::~ConfirmationPopup()
index 493169e..cde648a 100644 (file)
@@ -263,10 +263,6 @@ Popup::Popup()
   mTailRightImage( DEFAULT_TAIL_RIGHT_IMAGE_PATH )
 {
   SetKeyboardNavigationSupport( true );
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::Dialog, true ) );
-  } );
 }
 
 void Popup::OnInitialize()
old mode 100644 (file)
new mode 100755 (executable)
index fb6c1b4..2b89fed
@@ -114,10 +114,6 @@ ProgressBar::ProgressBar()
   mSecondaryProgressValue( DEFAULT_VALUE ),
   mIndeterminate( false )
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::ProgressBar ) );
-  } );
 }
 
 ProgressBar::~ProgressBar()
@@ -593,29 +589,6 @@ void ProgressBar::OnStageConnection( int depth )
   }
 }
 
-double ProgressBar::AccessibleImpl::GetMinimum() { return DEFAULT_LOWER_BOUND; }
-
-double ProgressBar::AccessibleImpl::GetCurrent()
-{
-  auto p = Toolkit::ProgressBar::DownCast( self );
-  return p.GetProperty( Toolkit::ProgressBar::Property::PROGRESS_VALUE )
-      .Get< float >();
-}
-
-double ProgressBar::AccessibleImpl::GetMaximum() { return DEFAULT_UPPER_BOUND; }
-
-bool ProgressBar::AccessibleImpl::SetCurrent( double current )
-{
-  if( current < GetMinimum() || current > GetMaximum() )
-    return false;
-  auto p = Toolkit::ProgressBar::DownCast( self );
-  p.SetProperty( Toolkit::ProgressBar::Property::PROGRESS_VALUE,
-                 static_cast< float >( current ) );
-  return true;
-}
-
-double ProgressBar::AccessibleImpl::GetMinimumIncrement() { return 0.001; }
-
 } // namespace Internal
 
 } // namespace Toolkit
old mode 100644 (file)
new mode 100755 (executable)
index fbdf53b..5b0ffd2
@@ -256,18 +256,6 @@ private:
   float mProgressValue;                                               ///< Current value of ProgressBar
   float mSecondaryProgressValue;                                      ///< Current loading value of ProgressBar
   bool mIndeterminate;                                                ///< Whether the progress state is determined or not
-
-protected:
-  struct AccessibleImpl : public Control::AccessibleImpl,
-                          public virtual Dali::Accessibility::Value
-  {
-    using Control::AccessibleImpl::AccessibleImpl;
-    double GetMinimum() override;
-    double GetCurrent() override;
-    double GetMaximum() override;
-    bool SetCurrent( double ) override;
-    double GetMinimumIncrement() override;
-  };
 };
 
 } // namespace Internal
old mode 100644 (file)
new mode 100755 (executable)
index 83cd71e..cd8438e
@@ -204,10 +204,6 @@ ScrollBar::ScrollBar(Toolkit::ScrollBar::Direction direction)
   mIsPanning(false),
   mIndicatorFirstShow(true)
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::ScrollBar ) );
-  } );
 }
 
 ScrollBar::~ScrollBar()
@@ -861,39 +857,6 @@ Toolkit::ScrollBar ScrollBar::New(Toolkit::ScrollBar::Direction direction)
   return handle;
 }
 
-double ScrollBar::AccessibleImpl::GetMinimum()
-{
-  auto p = Toolkit::ScrollBar::DownCast( self );
-  return p.GetProperty( GetImpl( p ).mPropertyMinScrollPosition ).Get< float >();
-}
-
-double ScrollBar::AccessibleImpl::GetCurrent()
-{
-  auto p = Toolkit::ScrollBar::DownCast( self );
-  if( GetImpl( p ).mPropertyScrollPosition == Property::INVALID_INDEX )
-    throw Dali::Accessibility::AccessibleError(
-        "Scroll position is INVALID_INDEX" );
-  return p.GetProperty( GetImpl( p ).mPropertyScrollPosition ).Get< float >();
-}
-
-double ScrollBar::AccessibleImpl::GetMaximum()
-{
-  auto p = Toolkit::ScrollBar::DownCast( self );
-  return p.GetProperty( GetImpl( p ).mPropertyMaxScrollPosition ).Get< float >();
-}
-
-bool ScrollBar::AccessibleImpl::SetCurrent( double current )
-{
-  if( current < GetMinimum() || current > GetMaximum() )
-    return false;
-  auto p = Toolkit::ScrollBar::DownCast( self );
-  p.SetProperty( GetImpl( p ).mPropertyScrollPosition,
-                 static_cast< float >( current ) );
-  return true;
-}
-
-double ScrollBar::AccessibleImpl::GetMinimumIncrement() { return 0.001; }
-
 } // namespace Internal
 
 } // namespace Toolkit
old mode 100644 (file)
new mode 100755 (executable)
index 6b022d5..d95d190
@@ -319,18 +319,6 @@ private:
 
   bool mIsPanning                 : 1;                               ///< Whether the scroll bar is being panned.
   bool mIndicatorFirstShow        : 1;                               ///< True if the indicator has never been shown
-
-protected:
-  struct AccessibleImpl : public Control::AccessibleImpl,
-                          public virtual Dali::Accessibility::Value
-  {
-    using Control::AccessibleImpl::AccessibleImpl;
-    double GetMinimum() override;
-    double GetCurrent() override;
-    double GetMaximum() override;
-    bool SetCurrent( double ) override;
-    double GetMinimumIncrement() override;
-  };
 };
 
 } // namespace Internal
old mode 100644 (file)
new mode 100755 (executable)
index 7c01138..275995d
@@ -158,10 +158,6 @@ Slider::Slider()
   mShowValue( false ),
   mSnapToMarks( false )
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::Slider ) );
-  } );
 }
 
 Slider::~Slider()
@@ -1411,39 +1407,6 @@ Property::Value Slider::GetProperty( BaseObject* object, Property::Index propert
   return value;
 }
 
-double Slider::AccessibleImpl::GetMinimum()
-{
-  auto p = Toolkit::Slider::DownCast( self );
-  return p.GetProperty( GetImpl( p ).mLowerBound ).Get< float >();
-}
-
-double Slider::AccessibleImpl::GetCurrent()
-{
-  auto p = Toolkit::Slider::DownCast( self );
-  return p.GetProperty( GetImpl( p ).mValue ).Get< float >();
-}
-
-double Slider::AccessibleImpl::GetMaximum()
-{
-  auto p = Toolkit::Slider::DownCast( self );
-  return p.GetProperty( GetImpl( p ).mValue ).Get< float >();
-}
-
-bool Slider::AccessibleImpl::SetCurrent( double current )
-{
-  if( current < GetMinimum() || current > GetMaximum() )
-    return false;
-  auto p = Toolkit::Slider::DownCast( self );
-  p.SetProperty( GetImpl( p ).mValue, static_cast< float >( current ) );
-  return true;
-}
-
-double Slider::AccessibleImpl::GetMinimumIncrement()
-{
-  auto p = Toolkit::Slider::DownCast( self );
-  return p.GetProperty( GetImpl( p ).mMarkTolerance ).Get< float >();
-}
-
 } // namespace Internal
 
 } // namespace Toolkit
old mode 100644 (file)
new mode 100755 (executable)
index e7a9d47..cbb23b0
@@ -755,18 +755,6 @@ private:
   bool mShowPopup   : 1,      ///< Show the popup or not
        mShowValue   : 1,      ///< Whether to display the value number or not on the handle
        mSnapToMarks : 1;      ///< Turn on or off snapping to marks
-
-protected:
-  struct AccessibleImpl : public Control::AccessibleImpl,
-                          public virtual Dali::Accessibility::Value
-  {
-    using Control::AccessibleImpl::AccessibleImpl;
-    double GetMinimum() override;
-    double GetCurrent() override;
-    double GetMaximum() override;
-    bool SetCurrent( double ) override;
-    double GetMinimumIncrement() override;
-  };
 };
 
 } // namespace Internal
index e0722ab..20fd25c 100644 (file)
@@ -513,9 +513,9 @@ void TextEditor::SetProperty( BaseObject* object, Property::Index index, const P
         if( impl.mController )
         {
 
-          // The line spacing isn't supported by the TextEditor. Since it's
-          // supported by the TextEditor for now it must be ignored. The
-          // property is being shadowed locally so its value isn't affected.
+          // The line spacing isn't supported by the TextEditor. Since it's supported
+          // by the TextLabel for now it must be ignored. The property is being shadowed
+          // locally so its value isn't affected.
           const float lineSpacing = value.Get<float>();
           impl.mLineSpacing = lineSpacing;
           // set it to 0.0 due to missing implementation
@@ -1150,8 +1150,6 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind
   return value;
 }
 
-Text::ControllerPtr TextEditor::getController() { return mController; }
-
 bool TextEditor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
 {
   Dali::BaseHandle handle( object );
@@ -1836,10 +1834,6 @@ TextEditor::TextEditor()
   mScrollBarEnabled( false ),
   mScrollStarted( false )
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::Text ) );
-  } );
 }
 
 TextEditor::~TextEditor()
@@ -1853,97 +1847,6 @@ TextEditor::~TextEditor()
   }
 }
 
-std::string TextEditor::AccessibleImpl::GetName()
-{
-  auto slf = Toolkit::TextEditor::DownCast( self );
-  return slf.GetProperty( Toolkit::TextEditor::Property::TEXT )
-      .Get< std::string >();
-}
-
-std::string TextEditor::AccessibleImpl::GetText( size_t startOffset,
-                                                 size_t endOffset )
-{
-  if( endOffset <= startOffset )
-    return {};
-
-  auto slf = Toolkit::TextEditor::DownCast( self );
-  auto txt =
-      slf.GetProperty( Toolkit::TextEditor::Property::TEXT ).Get< std::string >();
-
-  if( txt.size() > startOffset || txt.size() > endOffset )
-    return {};
-
-  return txt.substr( startOffset, endOffset - startOffset );
-}
-
-size_t TextEditor::AccessibleImpl::GetCharacterCount()
-{
-  auto slf = Toolkit::TextEditor::DownCast( self );
-  auto txt =
-      slf.GetProperty( Toolkit::TextEditor::Property::TEXT ).Get< std::string >();
-
-  return txt.size();
-}
-
-Dali::Accessibility::Range TextEditor::AccessibleImpl::GetTextAtOffset(
-    size_t offset, Dali::Accessibility::TextBoundary boundary )
-{
-  return {};
-}
-
-Dali::Accessibility::Range
-TextEditor::AccessibleImpl::GetSelection( size_t selectionNum )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return {};
-
-  auto slf = Toolkit::TextEditor::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->RetrieveSelection( ret );
-
-  return Dali::Accessibility::Range( 0, ret.size(), ret );
-}
-
-bool TextEditor::AccessibleImpl::RemoveSelection( size_t selectionNum )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return false;
-
-  auto slf = Toolkit::TextEditor::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->SetSelection( 0, 0 );
-  return true;
-}
-
-bool TextEditor::AccessibleImpl::SetSelection( size_t selectionNum,
-                                               size_t startOffset,
-                                               size_t endOffset )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return false;
-
-  auto slf = Toolkit::TextEditor::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->SetSelection( startOffset,
-                                                               endOffset );
-  return true;
-}
-
-bool TextEditor::AccessibleImpl::CopyText( size_t startPosition,
-                                           size_t endPosition )
-{
-  return {};
-}
-
-bool TextEditor::AccessibleImpl::CutText( size_t startPosition,
-                                          size_t endPosition )
-{
-  return {};
-}
-
 } // namespace Internal
 
 } // namespace Toolkit
index 1e8cfdd..a3a8854 100644 (file)
@@ -20,7 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
-#include <dali/public-api/adaptor-framework/accessibility.h>
 #include <dali/public-api/animation/animation.h>
 
 // INTERNAL INCLUDES
@@ -192,8 +191,6 @@ private: // From Control
    */
   virtual void AddDecoration( Actor& actor, bool needsClipping );
 
-  Text::ControllerPtr getController();
-
 private: // Implementation
 
   /**
@@ -309,26 +306,6 @@ private: // Data
   bool mScrollAnimationEnabled:1;
   bool mScrollBarEnabled:1;
   bool mScrollStarted:1;
-
-  struct AccessibleImpl : public Control::AccessibleImpl,
-                          public virtual Dali::Accessibility::Text,
-                          public virtual Dali::Accessibility::EditableText
-  {
-    using Control::AccessibleImpl::AccessibleImpl;
-
-    std::string GetName() override;
-    std::string GetText( size_t startOffset, size_t endOffset ) override;
-    size_t GetCharacterCount() override;
-    Dali::Accessibility::Range
-    GetTextAtOffset( size_t offset,
-                     Dali::Accessibility::TextBoundary boundary ) override;
-    Dali::Accessibility::Range GetSelection( size_t selectionNum ) override;
-    bool RemoveSelection( size_t selectionNum ) override;
-    bool SetSelection( size_t selectionNum, size_t startOffset,
-                       size_t endOffset ) override;
-    bool CopyText( size_t startPosition, size_t endPosition ) override;
-    bool CutText( size_t startPosition, size_t endPosition ) override;
-  };
 };
 
 } // namespace Internal
index 20fa1b8..137d0c4 100644 (file)
@@ -1431,8 +1431,6 @@ void TextField::OnRelayout( const Vector2& size, RelayoutContainer& container )
   }
 }
 
-Text::ControllerPtr TextField::getController() { return mController; }
-
 void TextField::RenderText( Text::Controller::UpdateTextType updateTextType )
 {
   Actor renderableActor;
@@ -1797,10 +1795,6 @@ TextField::TextField()
   mExceedPolicy( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP ),
   mHasBeenStaged( false )
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::Text ) );
-  } );
 }
 
 TextField::~TextField()
@@ -1813,115 +1807,6 @@ TextField::~TextField()
   }
 }
 
-std::string TextField::AccessibleImpl::GetName()
-{
-  auto slf = Toolkit::TextField::DownCast( self );
-  return slf.GetProperty( Toolkit::TextField::Property::TEXT ).Get< std::string >();
-}
-
-std::string TextField::AccessibleImpl::GetText( size_t startOffset,
-                                                size_t endOffset )
-{
-  if( endOffset <= startOffset )
-    return {};
-
-  auto slf = Toolkit::TextField::DownCast( self );
-  auto txt =
-      slf.GetProperty( Toolkit::TextField::Property::TEXT ).Get< std::string >();
-
-  if( txt.size() > startOffset || txt.size() > endOffset )
-    return {};
-
-  return txt.substr( startOffset, endOffset - startOffset );
-}
-
-size_t TextField::AccessibleImpl::GetCharacterCount()
-{
-  auto slf = Toolkit::TextField::DownCast( self );
-  auto txt =
-      slf.GetProperty( Toolkit::TextField::Property::TEXT ).Get< std::string >();
-
-  return txt.size();
-}
-
-Dali::Accessibility::Range TextField::AccessibleImpl::GetTextAtOffset(
-    size_t offset, Dali::Accessibility::TextBoundary boundary )
-{
-  return {};
-}
-
-Dali::Accessibility::Range
-TextField::AccessibleImpl::GetSelection( size_t selectionNum )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return {};
-
-  auto slf = Toolkit::TextField::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->RetrieveSelection( ret );
-
-  return Dali::Accessibility::Range( 0, ret.size(), ret );
-}
-
-bool TextField::AccessibleImpl::RemoveSelection( size_t selectionNum )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return false;
-
-  auto slf = Toolkit::TextField::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->SetSelection( 0, 0 );
-  return true;
-}
-
-bool TextField::AccessibleImpl::SetSelection( size_t selectionNum,
-                                              size_t startOffset,
-                                              size_t endOffset )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return false;
-
-  auto slf = Toolkit::TextField::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->SetSelection( startOffset,
-                                                               endOffset );
-  return true;
-}
-
-bool TextField::AccessibleImpl::CopyText( size_t startPosition,
-                                          size_t endPosition )
-{
-  if( endPosition <= startPosition )
-    return false;
-
-  auto t = GetText( startPosition, endPosition );
-  auto slf = Toolkit::TextField::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->CopyStringToClipboard( t );
-
-  return true;
-}
-
-bool TextField::AccessibleImpl::CutText( size_t startPosition,
-                                         size_t endPosition )
-{
-  if( endPosition <= startPosition )
-    return false;
-
-  auto txt = GetText( startPosition, endPosition );
-  auto slf = Toolkit::TextField::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->CopyStringToClipboard( txt );
-
-  slf.SetProperty( Toolkit::TextField::Property::TEXT,
-                   txt.substr( startPosition, endPosition - startPosition ) );
-
-  return true;
-}
-
 } // namespace Internal
 
 } // namespace Toolkit
index 6a6be64..b8f49ee 100644 (file)
@@ -97,8 +97,6 @@ public:
    */
   Toolkit::TextField::InputStyleChangedSignalType& InputStyleChangedSignal();
 
-  Text::ControllerPtr getController();
-
 private: // From Control
 
   /**
@@ -283,27 +281,6 @@ private: // Data
   int mRenderingBackend;
   int mExceedPolicy;
   bool mHasBeenStaged:1;
-
-protected:
-  struct AccessibleImpl : public Control::AccessibleImpl,
-                          public virtual Dali::Accessibility::Text,
-                          public virtual Dali::Accessibility::EditableText
-  {
-    using Control::AccessibleImpl::AccessibleImpl;
-
-    std::string GetName() override;
-    std::string GetText( size_t startOffset, size_t endOffset ) override;
-    size_t GetCharacterCount() override;
-    Dali::Accessibility::Range
-    GetTextAtOffset( size_t offset,
-                     Dali::Accessibility::TextBoundary boundary ) override;
-    Dali::Accessibility::Range GetSelection( size_t selectionNum ) override;
-    bool RemoveSelection( size_t selectionNum ) override;
-    bool SetSelection( size_t selectionNum, size_t startOffset,
-                       size_t endOffset ) override;
-    bool CopyText( size_t startPosition, size_t endPosition ) override;
-    bool CutText( size_t startPosition, size_t endPosition ) override;
-  };
 };
 
 } // namespace Internal
index 591e614..c3607f5 100644 (file)
@@ -544,9 +544,11 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr
       impl.RequestTextRelayout();
     }
   }
-}
 
-Text::ControllerPtr TextLabel::getController() { return mController; }
+
+
+
+}
 
 Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index index )
 {
@@ -1083,94 +1085,12 @@ TextLabel::TextLabel()
   mRenderingBackend( DEFAULT_RENDERING_BACKEND ),
   mTextUpdateNeeded( false )
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::Label ) );
-  } );
 }
 
 TextLabel::~TextLabel()
 {
 }
 
-std::string TextLabel::AccessibleImpl::GetName()
-{
-  auto slf = Toolkit::TextLabel::DownCast( self );
-  return slf.GetProperty( Toolkit::TextLabel::Property::TEXT ).Get< std::string >();
-}
-
-std::string TextLabel::AccessibleImpl::GetText( size_t startOffset,
-                                                size_t endOffset )
-{
-  if( endOffset <= startOffset )
-    return {};
-
-  auto slf = Toolkit::TextLabel::DownCast( self );
-  auto txt =
-      slf.GetProperty( Toolkit::TextLabel::Property::TEXT ).Get< std::string >();
-
-  if( txt.size() > startOffset || txt.size() > endOffset )
-    return {};
-
-  return txt.substr( startOffset, endOffset - startOffset );
-}
-
-size_t TextLabel::AccessibleImpl::GetCharacterCount()
-{
-  auto slf = Toolkit::TextLabel::DownCast( self );
-  auto txt =
-      slf.GetProperty( Toolkit::TextLabel::Property::TEXT ).Get< std::string >();
-
-  return txt.size();
-}
-
-Dali::Accessibility::Range TextLabel::AccessibleImpl::GetTextAtOffset(
-    size_t offset, Dali::Accessibility::TextBoundary boundary )
-{
-  return {};
-}
-
-Dali::Accessibility::Range
-TextLabel::AccessibleImpl::GetSelection( size_t selectionNum )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return {};
-
-  auto slf = Toolkit::TextLabel::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->RetrieveSelection( ret );
-
-  return Dali::Accessibility::Range( 0, ret.size(), ret );
-}
-
-bool TextLabel::AccessibleImpl::RemoveSelection( size_t selectionNum )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return false;
-
-  auto slf = Toolkit::TextLabel::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->SetSelection( 0, 0 );
-  return true;
-}
-
-bool TextLabel::AccessibleImpl::SetSelection( size_t selectionNum,
-                                              size_t startOffset,
-                                              size_t endOffset )
-{
-  // Since DALi supports only one selection indexes higher than 0 are ignored
-  if( selectionNum > 0 )
-    return false;
-
-  auto slf = Toolkit::TextLabel::DownCast( self );
-  std::string ret;
-  Dali::Toolkit::GetImpl( slf ).getController()->SetSelection( startOffset,
-                                                               endOffset );
-  return true;
-}
-
 } // namespace Internal
 
 } // namespace Toolkit
index b98456a..85e94ab 100644 (file)
@@ -73,8 +73,6 @@ public:
    */
   static Property::Value GetProperty( BaseObject* object, Property::Index index );
 
-  Text::ControllerPtr getController();
-
 private: // From Control
 
   /**
@@ -153,24 +151,6 @@ private: // Data
 
   int mRenderingBackend;
   bool mTextUpdateNeeded:1;
-
-protected:
-  struct AccessibleImpl : public Control::AccessibleImpl,
-                          public virtual Dali::Accessibility::Text
-  {
-    using Control::AccessibleImpl::AccessibleImpl;
-
-    std::string GetName() override;
-    std::string GetText( size_t startOffset, size_t endOffset ) override;
-    size_t GetCharacterCount() override;
-    Dali::Accessibility::Range
-    GetTextAtOffset( size_t offset,
-                     Dali::Accessibility::TextBoundary boundary ) override;
-    Dali::Accessibility::Range GetSelection( size_t selectionNum ) override;
-    bool RemoveSelection( size_t selectionNum ) override;
-    bool SetSelection( size_t selectionNum, size_t startOffset,
-                       size_t endOffset ) override;
-  };
 };
 
 } // namespace Internal
index 2bbba0e..26b14b6 100644 (file)
@@ -884,10 +884,6 @@ TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* cal
 
 TextSelectionPopup::~TextSelectionPopup()
 {
-  SetAccessibilityConstructor( []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-        new AccessibleImpl( actor, Dali::Accessibility::Role::Dialog, true ) );
-  } );
 }
 
 
index 5275627..5f34488 100644 (file)
@@ -1935,13 +1935,6 @@ void Controller::Impl::RetrieveSelection( std::string& selectedText, bool delete
   }
 }
 
-void Controller::Impl::SetSelection( int start, int end )
-{
-  mEventData->mLeftSelectionPosition = start;
-  mEventData->mRightSelectionPosition = end;
-  mEventData->mUpdateCursorPosition = true;
-}
-
 void Controller::Impl::ShowClipboard()
 {
   if( mClipboard )
index 8d3690b..52dad25 100644 (file)
@@ -614,8 +614,6 @@ struct Controller::Impl
    */
   void RetrieveSelection( std::string& selectedText, bool deleteAfterRetrieval );
 
-  void SetSelection( int start, int end );
-
   void ShowClipboard();
 
   void HideClipboard();
old mode 100644 (file)
new mode 100755 (executable)
index f1af74e..f47b526
@@ -661,26 +661,6 @@ void Controller::UpdateAfterFontChange( const std::string& newDefaultFont )
   }
 }
 
-void Controller::RetrieveSelection( std::string& selectedText )
-{
-  mImpl->RetrieveSelection( selectedText, false );
-}
-
-void Controller::SetSelection( int start, int end )
-{
-  mImpl->SetSelection( start, end );
-}
-
-void Controller::CopyStringToClipboard( std::string& source )
-{
-  mImpl->CopyStringToClipboard( source );
-}
-
-void Controller::SendSelectionToClipboard( bool deleteAfterSending )
-{
-  mImpl->SendSelectionToClipboard( deleteAfterSending );
-}
-
 // public : Default style & Input style
 
 void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily )
old mode 100644 (file)
new mode 100755 (executable)
index 478d797..b2321c4
@@ -550,14 +550,6 @@ public: // Update.
    */
   void UpdateAfterFontChange( const std::string& newDefaultFont );
 
-  void RetrieveSelection( std::string& selectedText );
-
-  void SetSelection( int start, int end );
-
-  void CopyStringToClipboard( std::string& source );
-
-  void SendSelectionToClipboard( bool deleteAfterSending );
-
 public: // Default style & Input style
 
   /**
old mode 100644 (file)
new mode 100755 (executable)
index 50d1e9a..49064a8
 #include <typeinfo>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/object/type-registry-helper.h>
-#include <dali/public-api/object/type-info.h>
 #include <dali/public-api/size-negotiation/relayout-container.h>
-#include <dali/public-api/common/stage.h>
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/align-enumerations.h>
@@ -48,7 +44,6 @@
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
-#include <dali/devel-api/actors/actor-devel.h>
 
 namespace Dali
 {
@@ -490,13 +485,6 @@ Control::Control( ControlBehaviour behaviourFlags )
   mImpl(new Impl(*this))
 {
   mImpl->mFlags = behaviourFlags;
-  SetAccessibilityConstructor(
-      []( Dali::Actor actor )
-          -> std::unique_ptr< Dali::Accessibility::Accessible > {
-        return std::unique_ptr< Dali::Accessibility::Accessible >(
-            new AccessibleImpl( actor,
-                                Dali::Accessibility::Role::RedundantObject ) );
-      } );
 }
 
 Control::~Control()
@@ -531,11 +519,6 @@ void Control::Initialize()
   {
     SetKeyboardNavigationSupport( true );
   }
-
-  Dali::TypeInfo type;
-  Self().GetTypeInfo( type );
-  auto type_name = type.GetName();
-  AccessibilitySetAttribute( "t", type_name );
 }
 
 void Control::OnInitialize()
@@ -819,275 +802,6 @@ const Control& GetImplementation( const Dali::Toolkit::Control& handle )
   return impl;
 }
 
-Toolkit::Control::AccessibilityActivateSignalType &Control::AccessibilityActivateSignal()
-{
-  return mImpl->mAccessibilityActivateSignal;
-}
-
-Dali::Accessibility::Accessible *Control::GetAccessibilityObject(Dali::Actor actor)
-{
-  if( actor )
-  {
-    auto q = Dali::Toolkit::Control::DownCast( actor );
-    if( q )
-    {
-      auto q2 = static_cast< Internal::Control* >( &q.GetImplementation() );
-      if( !q2->mImpl->accessibilityObject )
-        q2->mImpl->accessibilityObject =
-            q2->mImpl->accessibilityConstructor( actor );
-      return q2->mImpl->accessibilityObject.get();
-    }
-  }
-  return nullptr;
-}
-
-void Control::SetAccessibilityConstructor(
-    std::function< std::unique_ptr< Dali::Accessibility::Accessible >( Dali::Actor ) >
-        constructor )
-{
-  mImpl->accessibilityConstructor = constructor;
-}
-
-std::string Control::AccessibleImpl::GetName() { return self.GetName(); }
-std::string Control::AccessibleImpl::GetDescription() { return ""; }
-Dali::Accessibility::Accessible* Control::AccessibleImpl::GetParent()
-{
-  return Dali::Accessibility::Accessible::Get( self.GetParent() );
-}
-size_t Control::AccessibleImpl::GetChildCount() { return self.GetChildCount(); }
-Dali::Accessibility::Accessible*
-Control::AccessibleImpl::GetChildAtIndex( size_t index )
-{
-  return Dali::Accessibility::Accessible::Get(
-      self.GetChildAt( static_cast< unsigned int >( index ) ) );
-}
-size_t Control::AccessibleImpl::GetIndexInParent()
-{
-  auto s = self;
-  auto parent = s.GetParent();
-  if( !parent )
-    throw Dali::Accessibility::AccessibleError(
-        "can't call GetIndexInParent on object '" + GetAddress().ToString() +
-        "' without parent" );
-  auto count = parent.GetChildCount();
-  for( auto i = 0u; i < count; ++i )
-  {
-    auto c = parent.GetChildAt( i );
-    if( c == s )
-      return i;
-  }
-  throw Dali::Accessibility::AccessibleError(
-      "object '" + GetAddress().ToString() + "' isn't child of it's parent" );
-}
-
-Dali::Accessibility::Role Control::AccessibleImpl::GetRole() { return role; }
-
-void Control::AccessibilitySetAttribute( const std::string& key,
-                                         const std::string value )
-{
-  return mImpl->AccessibilitySetAttribute( key, value );
-}
-
-std::string Control::AccessibilityGetAttribute( const std::string& key )
-{
-  return mImpl->AccessibilityGetAttribute( key );
-}
-
-void Control::AccessibilityEraseAttribute( std::string& key )
-{
-  return mImpl->AccessibilityEraseAttribute( key );
-}
-
-bool Control::AccessibleImpl::CalculateIsVisible() const
-{
-  auto parent = self.GetParent();
-  if( parent )
-  {
-    auto p = Accessible::Get( parent );
-    auto p2 = dynamic_cast< AccessibleImpl* >( p );
-    if( p2 && !p2->CalculateIsVisible() )
-      return false;
-  }
-  auto stage = Stage::GetCurrent();
-  if( stage && self.OnStage() )
-  {
-    auto position =
-        self.GetProperty( Dali::DevelActor::Property::SCREEN_POSITION )
-            .Get< Vector2 >();
-    auto size = stage.GetSize();
-    if( position.x >= 0 && position.x < size.x )
-      return true;
-  }
-  return false;
-}
-
-Dali::Accessibility::States Control::AccessibleImpl::CalculateStates()
-{
-  Dali::Accessibility::States s;
-  s[Dali::Accessibility::State::Highlightable] = true;
-  s[Dali::Accessibility::State::Enabled] = true;
-  s[Dali::Accessibility::State::Sensitive] = true;
-  if( self.IsVisible() )
-    s[Dali::Accessibility::State::Showing] = true;
-  if( modal )
-  {
-    s[Dali::Accessibility::State::Modal] = true;
-  }
-  s[Dali::Accessibility::State::Visible] = CalculateIsVisible();
-  auto am = Toolkit::AccessibilityManager::Get();
-  if( self == am.GetCurrentFocusActor() )
-    s[Dali::Accessibility::State::Highlighted] = true;
-  return s;
-}
-
-Dali::Accessibility::States Control::AccessibleImpl::GetStates()
-{
-  return CalculateStates();
-}
-
-Dali::Accessibility::Attributes Control::AccessibleImpl::GetAttributes()
-{
-  std::unordered_map< std::string, std::string > attribute_map;
-  auto q = Dali::Toolkit::Control::DownCast( self );
-  auto w =
-      q.GetProperty( Dali::Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES );
-  auto z = w.GetMap();
-
-  if( z )
-  {
-    auto map_size = z->Count();
-
-    for( unsigned int i = 0; i < map_size; i++ )
-    {
-      auto map_key = z->GetKeyAt( i );
-      if( map_key.type == Property::Key::STRING )
-      {
-        std::string map_value;
-        if( z->GetValue( i ).Get( map_value ) )
-        {
-          attribute_map.emplace( std::move( map_key.stringKey ),
-                                 std::move( map_value ) );
-        }
-      }
-    }
-  }
-
-  return attribute_map;
-}
-
-Dali::Accessibility::ComponentLayer Control::AccessibleImpl::GetLayer()
-{
-  return Dali::Accessibility::ComponentLayer::Window;
-}
-
-Dali::Accessibility::Rectangle
-Control::AccessibleImpl::GetExtents( Dali::Accessibility::CoordType ctype )
-{
-  Vector2 screenPosition =
-      self.GetProperty( Dali::DevelActor::Property::SCREEN_POSITION )
-          .Get< Vector2 >();
-  Vector3 size = self.GetCurrentSize() * self.GetCurrentWorldScale();
-  bool positionUsesAnchorPoint =
-      self.GetProperty( Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT )
-          .Get< bool >();
-  Vector3 anchorPointOffSet =
-      size * ( positionUsesAnchorPoint ? self.GetCurrentAnchorPoint()
-                                       : AnchorPoint::TOP_LEFT );
-  Vector2 position = Vector2( screenPosition.x - anchorPointOffSet.x,
-                              screenPosition.y - anchorPointOffSet.y );
-
-  return {Dali::Accessibility::Point( (int)position.x, (int)position.y ),
-          Dali::Accessibility::Size( (int)size.x, (int)size.y )};
-}
-
-int Control::AccessibleImpl::GetMdiZOrder() { return 0; }
-bool Control::AccessibleImpl::GrabFocus() { return false; }
-double Control::AccessibleImpl::GetAlpha() { return 0; }
-bool Control::AccessibleImpl::SetExtents( Dali::Accessibility::Rectangle rect,
-                                          Dali::Accessibility::CoordType ctype )
-{
-  return false;
-}
-bool Control::AccessibleImpl::GrabHighlight()
-{
-  auto am = Toolkit::AccessibilityManager::Get();
-  auto old = am.GetCurrentFocusActor();
-  if( old != self )
-  {
-    if( old )
-    {
-      auto c = dynamic_cast< Dali::Accessibility::Component* >(
-          GetAccessibilityObject( old ) );
-      if( c )
-        c->ClearHighlight();
-    }
-    return am.SetCurrentFocusActor( self );
-  }
-  return false;
-}
-bool Control::AccessibleImpl::ClearHighlight()
-{
-  auto am = Toolkit::AccessibilityManager::Get();
-  if( am.GetCurrentFocusActor() == self )
-  {
-    am.ClearFocus();
-    return true;
-  }
-  return false;
-}
-int Control::AccessibleImpl::GetHighlightIndex() { return 0; }
-
-std::string Control::AccessibleImpl::GetActionName( size_t index )
-{
-  if( index >= GetActionCount() )
-    throw Dali::Accessibility::AccessibleError(
-        "index " + std::to_string( index ) + " is too large for action count " +
-        std::to_string( GetActionCount() ) );
-   Dali::TypeInfo type;
-  self.GetTypeInfo( type );
-  if( !type )
-    throw Dali::Accessibility::AccessibleError(
-        "GetActionName failed for object '" + GetAddress().ToString() +
-        "' due to the lack of TypeInfo." );
-  return type.GetActionName( index );
-}
-std::string Control::AccessibleImpl::GetLocalizedActionName( size_t index )
-{
-  // TODO: add localization
-  return GetActionName( index );
-}
-std::string Control::AccessibleImpl::GetActionDescription( size_t index )
-{
-  if( index >= GetActionCount() )
-    throw Dali::Accessibility::AccessibleError(
-        "index " + std::to_string( index ) + " is too large for action count " +
-        std::to_string( GetActionCount() ) );
-   return "";
-}
-size_t Control::AccessibleImpl::GetActionCount()
-{
-   Dali::TypeInfo type;
-  self.GetTypeInfo( type );
-  if( !type )
-    throw Dali::Accessibility::AccessibleError(
-        "GetActionCount failed for object '" + GetAddress().ToString() +
-        "' due to the lack of TypeInfo." );
-   return type.GetActionCount();
-}
-std::string Control::AccessibleImpl::GetActionKeyBinding( size_t index )
-{
-  if( index >= GetActionCount() )
-    throw Dali::Accessibility::AccessibleError(
-        "index " + std::to_string( index ) + " is too large for action count " +
-        std::to_string( GetActionCount() ) );
-   return "";
-}
-bool Control::AccessibleImpl::DoAction( size_t index )
-{
-  std::string actionName = GetActionName( index );
-  return self.DoAction( actionName, {} );
-}
-
 } // namespace Internal
 
 } // namespace Toolkit
index 4cf3f2a..9a1e560 100644 (file)
@@ -19,8 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/accessibility.h>
-#include <dali/integration-api/debug.h>
 #include <dali/public-api/adaptor-framework/style-change.h>
 #include <dali/public-api/events/long-press-gesture.h>
 #include <dali/public-api/events/pan-gesture.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-#include <functional>
-#include <memory>
-#include <string>
-
 namespace Dali
 {
 namespace Toolkit
@@ -696,55 +690,7 @@ public:
 private:
   Impl* mImpl;
   /// @endcond
-public:
-  void SetAccessibilityConstructor(std::function<std::unique_ptr<Dali::Accessibility::Accessible>(Dali::Actor)> constructor);
-  static Dali::Accessibility::Accessible *GetAccessibilityObject(Dali::Actor actor);
-  Toolkit::Control::AccessibilityActivateSignalType &AccessibilityActivateSignal();
-  void AccessibilitySetAttribute( const std::string& key, const std::string value );
-  std::string AccessibilityGetAttribute( const std::string& key );
-  void AccessibilityEraseAttribute( std::string& key );
-
-  struct AccessibleImpl : public virtual Dali::Accessibility::Accessible, public virtual Dali::Accessibility::Component, public virtual Dali::Accessibility::Collection,
-            public virtual Dali::Accessibility::Action {
-    Dali::Actor self;
-    Dali::Accessibility::Role role;
-    bool modal = false, root = false;
-
-    AccessibleImpl( Dali::Actor self, Dali::Accessibility::Role role,
-                    bool modal = false )
-        : self( self ), role( role ), modal( modal ) {}
-
-    std::string GetName() override;
-    std::string GetDescription() override;
-    Dali::Accessibility::Accessible* GetParent() override;
-    size_t GetChildCount() override;
-    Dali::Accessibility::Accessible* GetChildAtIndex( size_t index ) override;
-    size_t GetIndexInParent() override;
-    Dali::Accessibility::Role GetRole() override;
-    Dali::Accessibility::States GetStates() override;
-    Dali::Accessibility::Attributes GetAttributes() override;
-    Dali::Accessibility::Rectangle
-    GetExtents( Dali::Accessibility::CoordType ctype ) override;
-    Dali::Accessibility::ComponentLayer GetLayer() override;
-    int GetMdiZOrder() override;
-    bool GrabFocus() override;
-    double GetAlpha() override;
-    bool SetExtents( Dali::Accessibility::Rectangle rect,
-                     Dali::Accessibility::CoordType ctype ) override;
-    bool GrabHighlight() override;
-    bool ClearHighlight() override;
-    int GetHighlightIndex() override;
-
-    std::string GetActionName( size_t index ) override;
-    std::string GetLocalizedActionName( size_t index ) override;
-    std::string GetActionDescription( size_t index ) override;
-    size_t GetActionCount() override;
-    std::string GetActionKeyBinding( size_t index ) override;
-    bool DoAction( size_t index ) override;
-
-    virtual Dali::Accessibility::States CalculateStates();
-    virtual bool CalculateIsVisible() const;
-  };
+
 };
 
 /**
index 5762fff..14205f9 100644 (file)
@@ -170,12 +170,6 @@ Control::ResourceReadySignalType&  Control::ResourceReadySignal()
   return controlImpl.mResourceReadySignal;
 }
 
-Control::AccessibilityActivateSignalType& Control::AccessibilityActivateSignal()
-{
-  return Internal::GetImplementation(*this).AccessibilityActivateSignal();
-}
-
-
 Control::Control(Internal::Control& implementation)
 : CustomActor(implementation)
 {
@@ -187,23 +181,6 @@ Control::Control(Dali::Internal::CustomActor* internal)
   VerifyCustomActorPointer<Internal::Control>(internal);
 }
 
-void Control::AccessibilitySetAttribute( const std::string& key,
-                                         const std::string value )
-{
-  return Internal::GetImplementation( *this ).AccessibilitySetAttribute( key,
-                                                                         value );
-}
-
-std::string Control::AccessibilityGetAttribute( const std::string& key )
-{
-  return Internal::GetImplementation( *this ).AccessibilityGetAttribute( key );
-}
-
-void Control::AccessibilityEraseAttribute( std::string& key )
-{
-  return Internal::GetImplementation( *this ).AccessibilityEraseAttribute( key );
-}
-
 } // namespace Toolkit
 
 } // namespace Dali
old mode 100755 (executable)
new mode 100644 (file)
index 12aaaf8..8e522a2
@@ -154,11 +154,6 @@ public:
       MARGIN,
 
       /**
-       * @ TODO
-       */
-      ACCESSIBILITY_ATTRIBUTES,
-
-      /**
        * @brief The inner space of the control.
        * @details Name "padding", type Property::EXTENTS.
        * @SINCE_1_2.62
@@ -199,8 +194,6 @@ public:
   /// @brief ResourceReady signal type. @SINCE_1_2.60
   typedef Signal<void ( Control ) > ResourceReadySignalType;
 
-  typedef Signal< void ( ) > AccessibilityActivateSignalType;
-
 public: // Creation & Destruction
 
   /**
@@ -497,8 +490,6 @@ public:
    */
   ResourceReadySignalType& ResourceReadySignal();
 
-  Toolkit::Control::AccessibilityActivateSignalType &AccessibilityActivateSignal();
-
 public: // Intended for control developers
 
   /**
@@ -572,10 +563,6 @@ public: // Templates for Deriving Classes
     }
   }
 
-  void AccessibilitySetAttribute( const std::string& key,
-                                  const std::string value );
-  std::string AccessibilityGetAttribute( const std::string& key );
-  void AccessibilityEraseAttribute( std::string& key );
 };
 
 /**