X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Faccessibility%2Fcommon%2Faccessibility-adaptor-impl.cpp;h=d3eb43ba99fba250277236218b8a0fd7798a4e2b;hb=5b648302d22f4373c4993e9daa35e2ea7de1d758;hp=d6d7f3b4f61d4847d68c7da92b72f5e0978f02ae;hpb=454e03e2413be60a42ae4bdd2976b0e1d6a20945;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
old mode 100644
new mode 100755
index d6d7f3b..d3eb43b
--- a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
+++ b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -23,10 +23,10 @@
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/hover-event-integ.h>
-#include <dali/integration-api/events/gesture-requests.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/system/common/system-settings.h>
 
 namespace Dali
 {
@@ -49,9 +49,7 @@ Debug::Filter* gAccessibilityAdaptorLogFilter = Debug::Filter::New(Debug::NoLogg
 AccessibilityAdaptor::AccessibilityAdaptor()
 : mReadPosition(),
   mActionHandler( NULL ),
-  mIndicator( NULL ),
-  mIsEnabled( false ),
-  mIndicatorFocused( false )
+  mIsEnabled( false )
 {
   mAccessibilityGestureDetector = new AccessibilityGestureDetector();
 }
@@ -113,11 +111,6 @@ void AccessibilityAdaptor::SetGestureHandler(AccessibilityGestureHandler& handle
   }
 }
 
-void AccessibilityAdaptor::SetIndicator(IndicatorInterface* indicator)
-{
-  mIndicator = indicator;
-}
-
 bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback)
 {
   bool ret = false;
@@ -166,8 +159,8 @@ bool AccessibilityAdaptor::HandleActionReadEvent(unsigned int x, unsigned int y,
 
   DALI_LOG_INFO(gAccessibilityAdaptorLogFilter, Debug::General, "[%s:%d] %d , %d\n", __FUNCTION__, __LINE__, x, y);
 
-  mReadPosition.x = x;
-  mReadPosition.y = y;
+  mReadPosition.x = static_cast< float > (x);
+  mReadPosition.y = static_cast< float > (y);
 
   if( mActionHandler )
   {
@@ -248,7 +241,7 @@ bool AccessibilityAdaptor::HandleActionClearFocusEvent()
   return ret;
 }
 
-bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp)
+bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, uint32_t timeStamp)
 {
   bool ret = false;
 
@@ -277,7 +270,7 @@ bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsi
   return ret;
 }
 
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
+bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, uint32_t timeStamp)
 {
   bool ret = false;
 
@@ -470,20 +463,6 @@ bool AccessibilityAdaptor::HandleActionZoomEvent()
   return ret;
 }
 
-bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent()
-{
-  bool ret = false;
-
-  if( mActionHandler )
-  {
-    ret = mActionHandler->AccessibilityActionReadIndicatorInformation();
-  }
-
-  DALI_LOG_INFO(gAccessibilityAdaptorLogFilter, Debug::General, "[%s:%d] %s\n", __FUNCTION__, __LINE__, ret?"TRUE":"FALSE");
-
-  return ret;
-}
-
 bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent()
 {
   bool ret = false;