From b3fccd314e836ef1e1bf74a47e2bf8f0a500c09e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= <a.swigon@samsung.com>
Date: Wed, 22 Jul 2020 11:38:59 +0200
Subject: [PATCH] [AT-SPI] Remove AccessibilityAdaptor

Change-Id: If7961ebfe4b87d5a4cfaf52f87f493b09a1092f0
---
 .../internal/evas-plugin/scene-impl.cpp       | 126 +-----------------
 1 file changed, 1 insertion(+), 125 deletions(-)

diff --git a/dali-extension/internal/evas-plugin/scene-impl.cpp b/dali-extension/internal/evas-plugin/scene-impl.cpp
index d508333d..035c7fc0 100644
--- a/dali-extension/internal/evas-plugin/scene-impl.cpp
+++ b/dali-extension/internal/evas-plugin/scene-impl.cpp
@@ -17,7 +17,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/clipboard.h>
-#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/adaptor-framework/native-render-surface.h>
 #include <dali/integration-api/adaptor-framework/native-render-surface-factory.h>
@@ -293,130 +292,7 @@ void Scene::OnEvasObjectFocusOut()
 
 bool Scene::OnElmAccessibilityActionEvent( AccessActionInfo& accessActionInfo )
 {
-  bool ret = false;
-
-  if( mAdaptor == nullptr )
-  {
-    return ret;
-  }
-
-  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-  if( accessibilityAdaptor )
-  {
-    switch( accessActionInfo.actionBy )
-    {
-      case Dali::Extension::Internal::ACCESS_ACTION_HIGHLIGHT:
-      case Dali::Extension::Internal::ACCESS_ACTION_READ:
-      {
-        ret = accessibilityAdaptor.HandleActionReadEvent( (unsigned int)accessActionInfo.x, (unsigned int)accessActionInfo.y, true );
-      }
-      break;
-
-      case Dali::Extension::Internal::ACCESS_ACTION_HIGHLIGHT_PREV:
-      {
-        // if accessActionInfo.highlight_end is true, need to handle end_of_list sound feedback
-        ret = accessibilityAdaptor.HandleActionPreviousEvent( accessActionInfo.highlightCycle );
-        if(!ret)
-        {
-          // when focus moving was failed, clear the focus
-          accessibilityAdaptor.HandleActionClearFocusEvent();
-        }
-      }
-      break;
-
-      case Dali::Extension::Internal::ACCESS_ACTION_HIGHLIGHT_NEXT:
-      {
-        // if accessActionInfo.highlight_cycle is true, need to handle end_of_list sound feedback
-        ret = accessibilityAdaptor.HandleActionNextEvent( accessActionInfo.highlightCycle );
-        if(!ret)
-        {
-          // when focus moving was failed, clear the focus
-          accessibilityAdaptor.HandleActionClearFocusEvent();
-        }
-      }
-      break;
-
-      case Dali::Extension::Internal::ACCESS_ACTION_ACTIVATE:
-      {
-        ret = accessibilityAdaptor.HandleActionActivateEvent();
-      }
-      break;
-
-      case Dali::Extension::Internal::ACCESS_ACTION_UNHIGHLIGHT:
-      {
-        ret = accessibilityAdaptor.HandleActionClearFocusEvent();
-      }
-      break;
-
-      case Dali::Extension::Internal::ACCESS_ACTION_SCROLL:
-      {
-        Evas_Object* eo = mEvasWrapper->GetAccessibilityTarget();
-
-        if( eo )
-        {
-          int touchType = accessActionInfo.mouseType;
-
-          PointState::Type state( PointState::DOWN );
-
-          if( touchType == 0 )
-          {
-            state = PointState::DOWN; // mouse down
-          }
-          else if( touchType == 1 )
-          {
-            state = PointState::MOTION; // mouse move
-          }
-          else if( touchType == 2 )
-          {
-            state = PointState::UP; // mouse up
-          }
-          else
-          {
-            state = PointState::INTERRUPTED; // error
-          }
-
-          // Send touch event to accessibility manager.
-          Evas_Coord rel_x, rel_y, obj_x,  obj_y, obj_w, obj_h;
-
-          evas_object_geometry_get( eo, &obj_x,  &obj_y, &obj_w, &obj_h );
-
-          rel_x = accessActionInfo.x - obj_x;
-          rel_y = accessActionInfo.y - obj_y;
-
-          TouchPoint point( 0, state, (float)rel_x, (float)rel_y );
-
-          ret = accessibilityAdaptor.HandleActionScrollEvent( point, accessActionInfo.timeStamp );
-        }
-      }
-      break;
-
-      case Dali::Extension::Internal::ACCESS_ACTION_UP:
-      {
-        ret = accessibilityAdaptor.HandleActionUpEvent();
-      }
-      break;
-
-      case Dali::Extension::Internal::ACCESS_ACTION_DOWN:
-      {
-        ret = accessibilityAdaptor.HandleActionDownEvent();
-      }
-      break;
-
-      case Dali::Extension::Internal::ACCESS_ACTION_BACK:
-      default:
-      {
-        DALI_LOG_WARNING( "[%s:%d]\n", __FUNCTION__, __LINE__ );
-      }
-
-      break;
-    }
-  }
-  else
-  {
-    DALI_LOG_WARNING( "[%s:%d]\n", __FUNCTION__, __LINE__ );
-  }
-
-  return ret;
+  return false;
 }
 
 void Scene::OnEcoreWl2VisibilityChange( bool visible )
-- 
2.34.1