Removing Control::OnAccessibilityTouch

It's never been implemented in the wayland backend, so has
never been called.

Change-Id: Ia65084d7641146a74676b16db68b2a2dab368163

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index 6b0c796..66e0bcc 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@ -218,7 +218,6 @@ Impl::DummyControl::DummyControl()
 : DummyControlImpl(),
   initializeCalled(false),
   activatedCalled(false),
-  onAccTouchedCalled(false),
   onAccValueChangeCalled(false),
   themeChangeCalled(false),
   fontChangeCalled(false),
@@ -248,7 +247,6 @@ Impl::DummyControl::~DummyControl()
 
 void Impl::DummyControl::OnInitialize() { initializeCalled = true; }
 bool Impl::DummyControl::OnAccessibilityActivated() { activatedCalled = true; return true; }
-bool Impl::DummyControl::OnAccessibilityTouch(const TouchEvent& touch) { onAccTouchedCalled = true; return true; }
 bool Impl::DummyControl::OnAccessibilityValueChange( bool isIncrease )
 {
   onAccValueChangeCalled = true; return true;

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
index 5d66239..de4d66e 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
@@ -154,7 +154,6 @@ private: // From Internal::Control
 
   virtual void OnInitialize();
   virtual bool OnAccessibilityActivated();
-  virtual bool OnAccessibilityTouch( const TouchEvent& touch );
   virtual bool OnAccessibilityValueChange( bool isIncrease );
 
   virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
@@ -186,7 +185,6 @@ public:
 
   bool initializeCalled;
   bool activatedCalled;
-  bool onAccTouchedCalled;
   bool onAccValueChangeCalled;
   bool themeChangeCalled;
   bool fontChangeCalled;

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 9089fc5..72d4106 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
@@ -74,7 +74,6 @@ public:
   bool HandleActionDownEvent();
   bool HandleActionClearFocusEvent();
   bool HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp);
-  bool HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp);
   bool HandleActionBackEvent();
   bool HandleActionEnableEvent();
   bool HandleActionDisableEvent();
@@ -247,16 +246,6 @@ bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsi
   return false;
 }
 
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
-{
-  if( mActionHandler )
-  {
-    Dali::TouchEvent touch = Integration::NewTouchEvent(timeStamp, point);
-    return mActionHandler->AccessibilityActionTouch( touch );
-  }
-  return false;
-}
-
 bool AccessibilityAdaptor::HandleActionBackEvent()
 {
   if( mActionHandler )
@@ -504,11 +493,6 @@ bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsi
   return Internal::Adaptor::GetImplementation(*this).HandleActionScrollEvent(point, timeStamp);
 }
 
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
-{
-  return Internal::Adaptor::GetImplementation(*this).HandleActionTouchEvent(point, timeStamp);
-}
-
 bool AccessibilityAdaptor::HandleActionBackEvent()
 {
   return Internal::Adaptor::GetImplementation(*this).HandleActionBackEvent();

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
index a354847..fde3214 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
@@ -2289,32 +2289,6 @@ int UtcDaliAccessibilityManagerActionScrollSignalN(void)
   END_TEST;
 }
 
-int UtcDaliAccessibilityManagerActionTouch(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( " UtcDaliAccessibilityManagerActionTouch" );
-
-  AccessibilityManager manager = AccessibilityManager::Get();
-  DALI_TEST_CHECK( manager );
-
-  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
-  manager.SetFocusOrder( dummyControl, 1 );
-  application.GetScene().Add( dummyControl );
-  manager.SetCurrentFocusActor( dummyControl );
-
-  TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
-  accessibilityAdaptor.HandleActionTouchEvent( point, 0u );
-
-  DALI_TEST_CHECK( dummyImpl.onAccTouchedCalled );
-
-  END_TEST;
-}
-
-
 int UtcDaliAccessibilityManagerHandlePanGesture(void)
 {
   // Pan gesture sent from adaptor to manager via AccessibilityGestureHandler

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
index 14686a7..36a8b22 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
@@ -765,16 +765,6 @@ int UtcDaliControlImplOnAccessibilityPanP(void)
   END_TEST;
 }
 
-int UtcDaliControlImplOnAccessibilityTouchP(void)
-{
-  ToolkitTestApplication application;
-  Control dummy = Control::New();
-  Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( dummy );
-  TouchEvent touch;
-  DALI_TEST_EQUALS( false, controlImpl.OnAccessibilityTouch( touch ), TEST_LOCATION );
-
-  END_TEST;
-}
 
 int UtcDaliControlImplOnAccessibilityActivatedP(void)
 {

diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
index 5dfbbfd..053cb96 100644 (file)
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
@@ -1302,21 +1302,6 @@ bool AccessibilityManager::AccessibilityActionStartStop()
   return mIsAccessibilityTtsEnabled;
 }
 
-bool AccessibilityManager::AccessibilityActionTouch(const TouchEvent& touch)
-{
-  bool handled = false;
-
-  // TODO: Need to convert the touchevent for the focused actor?
-
-  Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(GetCurrentFocusActor());
-  if(control)
-  {
-    handled = GetImplementation( control ).OnAccessibilityTouch(touch);
-  }
-
-  return handled;
-}
-
 bool AccessibilityManager::HandlePanGesture(const AccessibilityGestureEvent& panEvent)
 {
   bool handled = false;

diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
index 0efb565..3d02c5f 100644 (file)
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
@@ -658,13 +658,6 @@ private:
   virtual bool AccessibilityActionStartStop();
 
   /**
-   * Perform the accessibility action to mouse move (by one finger tap & hold and move).
-   * @param touch touch point and time of the event
-   * @return whether the accessibility action is performed or not.
-   */
-  virtual bool AccessibilityActionTouch(const TouchEvent& touch);
-
-  /**
    * This function is connected to the TtsPlayer StateChangeSignal.
    * It is called when the TTS players state changes.
    * @param previousState The previous state of the TTS player (for comparison)

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index cac8894..b66cdd6 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -386,11 +386,6 @@ bool Control::OnAccessibilityPan(PanGesture gesture)
   return false; // Accessibility pan gesture is not handled by default
 }
 
-bool Control::OnAccessibilityTouch(const TouchEvent& touch)
-{
-  return false; // Accessibility touch event is not handled by default
-}
-
 bool Control::OnAccessibilityValueChange(bool isIncrease)
 {
   return false; // Accessibility value change action is not handled by default

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index d0ca9f0..e49386d 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -478,16 +478,6 @@ public: // API for derived classes to override
   virtual bool OnAccessibilityPan( PanGesture gesture );
 
   /**
-   * @brief This method should be overridden by deriving classes when they wish to respond the accessibility
-   * touch event.
-   *
-   * @SINCE_1_0.0
-   * @param[in] touch The touch event
-   * @return true if the touch event has been consumed by this control
-   */
-  virtual bool OnAccessibilityTouch( const TouchEvent& touch );
-
-  /**
    * @brief This method should be overridden by deriving classes when they wish to respond
    * the accessibility up and down action (i.e. value change of slider control).
    *