X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-accessibility-adaptor.cpp;h=72d4106012618747f35dbb0eeeb3e95ef2128b46;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hp=286f7333adc22170b2873d0abb373e1ecdf0ee47;hpb=c125573992c196f15ece50589ae80efed63c8870;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 286f733..72d4106 100644
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,11 @@
  */
 
 #include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
 #include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
 #include <dali/devel-api/adaptor-framework/accessibility-action-handler.h>
 #include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>
+#include <dali/devel-api/adaptor-framework/accessibility-gesture-event.h>
+#include <dali/integration-api/events/touch-integ.h>
 
 namespace Dali
 {
@@ -53,7 +54,7 @@ public:
     mIsEnabled = enabled;
   }
 
-  void SendPanGesture( const Dali::Integration::PanGestureEvent& panEvent );
+  void SendPanGesture( const AccessibilityGestureEvent& panEvent );
 
 public:
 
@@ -73,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();
@@ -88,7 +88,6 @@ public:
   bool HandleActionReadFromTopEvent();
   bool HandleActionReadFromNextEvent();
   bool HandleActionZoomEvent();
-  bool HandleActionReadIndicatorInformationEvent();
   bool HandleActionReadPauseResumeEvent();
   bool HandleActionStartStopEvent();
 
@@ -116,6 +115,8 @@ Dali::AccessibilityAdaptor AccessibilityAdaptor::Get()
 
 AccessibilityAdaptor::AccessibilityAdaptor()
 : mIsEnabled(false),
+  mActionHandler(NULL),
+  mGestureHandler(NULL),
   mReadPosition( 0.0f, 0.0f )
 {
 }
@@ -139,7 +140,7 @@ bool AccessibilityAdaptor::IsEnabled() const
   return mIsEnabled;
 }
 
-void AccessibilityAdaptor::SendPanGesture( const Integration::PanGestureEvent& panEvent )
+void AccessibilityAdaptor::SendPanGesture( const AccessibilityGestureEvent& panEvent )
 {
   mGestureHandler->HandlePanGesture( panEvent );
 }
@@ -239,20 +240,8 @@ bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsi
 {
   if( mActionHandler )
   {
-    Dali::TouchEvent touchEvent;
-    touchEvent.points.push_back( point );
-    return mActionHandler->AccessibilityActionScroll( touchEvent );
-  }
-  return false;
-}
-
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
-{
-  if( mActionHandler )
-  {
-    Dali::TouchEvent touchEvent;
-    touchEvent.points.push_back( point );
-    return mActionHandler->AccessibilityActionTouch( touchEvent );
+    Dali::TouchEvent touch = Integration::NewTouchEvent(timeStamp, point);
+    return mActionHandler->AccessibilityActionScroll( touch );
   }
   return false;
 }
@@ -383,15 +372,6 @@ bool AccessibilityAdaptor::HandleActionZoomEvent()
   return false;
 }
 
-bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent()
-{
-  if( mActionHandler )
-  {
-    return mActionHandler->AccessibilityActionReadIndicatorInformation();
-  }
-  return false;
-}
-
 bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent()
 {
   if( mActionHandler )
@@ -513,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();
@@ -588,11 +563,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();
@@ -628,7 +598,7 @@ void SetEnabled( Dali::AccessibilityAdaptor adaptor, bool enabled )
   Dali::Internal::Adaptor::GetImplementation(adaptor).SetEnabled(enabled);
 }
 
-void SendPanGesture( Dali::AccessibilityAdaptor adaptor, const Dali::Integration::PanGestureEvent& panEvent )
+void SendPanGesture( Dali::AccessibilityAdaptor adaptor, const Dali::AccessibilityGestureEvent& panEvent )
 {
   Dali::Internal::Adaptor::GetImplementation(adaptor).SendPanGesture( panEvent );
 }