Revert "Revert "Move TouchPoint to Devel API""

This reverts commit f26bce354ce5547d57bbffd7468fceb7ef34d335.

diff --git a/dali/devel-api/adaptor-framework/accessibility-adaptor.h b/dali/devel-api/adaptor-framework/accessibility-adaptor.h
index 9be248321bcc0cf5368b39db618b10d0fb865bd9..733ec078a16eb352a0fe0cdc7bbac22bb13d13c4 100755 (executable)
--- a/dali/devel-api/adaptor-framework/accessibility-adaptor.h
+++ b/dali/devel-api/adaptor-framework/accessibility-adaptor.h
@@ -20,7 +20,7 @@
 
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/events/touch-point.h>
+#include <dali/devel-api/events/touch-point.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/dali-adaptor-common.h>
 

diff --git a/dali/integration-api/adaptor-framework/adaptor.h b/dali/integration-api/adaptor-framework/adaptor.h
index 834f25c722a6dac816355dbc40821219a4b601dc..698527547cdd0fa12f8e748c3eaa57b0829a1d3d 100644 (file)
--- a/dali/integration-api/adaptor-framework/adaptor.h
+++ b/dali/integration-api/adaptor-framework/adaptor.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/math/uint-16-pair.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/object/any.h>
-#include <dali/public-api/events/touch-point.h>
+#include <dali/devel-api/events/touch-point.h>
 #include <dali/integration-api/processor-interface.h>
 
 // INTERNAL INCLUDES

diff --git a/dali/internal/accessibility/common/accessibility-adaptor-impl.h b/dali/internal/accessibility/common/accessibility-adaptor-impl.h
index 2e1511e5ecdccf29cfa24845f262451172f87238..ed79b3ee8c3c0b473adec7b95a93e677ff31acc9 100644 (file)
--- a/dali/internal/accessibility/common/accessibility-adaptor-impl.h
+++ b/dali/internal/accessibility/common/accessibility-adaptor-impl.h
@@ -23,7 +23,7 @@
 
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/math/vector2.h>
-#include <dali/public-api/events/touch-point.h>
+#include <dali/devel-api/events/touch-point.h>
 #include <dali/integration-api/events/touch-event-combiner.h>
 
 // INTERNAL INCLUDES

diff --git a/dali/internal/adaptor/android/framework-android.cpp b/dali/internal/adaptor/android/framework-android.cpp
index 4d34aa0eeb77d7118d2b2276e231453138a5ff3d..f91f596ba2db8a4b36d94f071ecb8969f24893c8 100644 (file)
--- a/dali/internal/adaptor/android/framework-android.cpp
+++ b/dali/internal/adaptor/android/framework-android.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 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.
@@ -27,7 +27,7 @@
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/adaptor-framework/android/android-framework.h>
-#include <dali/public-api/events/touch-point.h>
+#include <dali/devel-api/events/touch-point.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/devel-api/events/key-event-devel.h>
 
@@ -389,7 +389,7 @@ struct Framework::Impl
       int32_t deviceId = AInputEvent_getDeviceId( event );
       float x = AMotionEvent_getX( event, 0 );
       float y = AMotionEvent_getY( event, 0 );
-      TouchPoint::State state = TouchPoint::Down;
+      Dali::PointState::Type state = Dali::PointState::DOWN;
       int32_t action = AMotionEvent_getAction( event );
       int64_t timeStamp = AMotionEvent_getEventTime( event );
 
@@ -398,16 +398,16 @@ struct Framework::Impl
       case AMOTION_EVENT_ACTION_DOWN:
         break;
       case AMOTION_EVENT_ACTION_UP:
-        state = TouchPoint::Up;
+        state = Dali::PointState::UP;
         break;
       case AMOTION_EVENT_ACTION_MOVE:
-        state = TouchPoint::Motion;
+        state = Dali::PointState::MOTION;
         break;
       case AMOTION_EVENT_ACTION_CANCEL:
-        state = TouchPoint::Interrupted;
+        state = Dali::PointState::INTERRUPTED;
         break;
       case AMOTION_EVENT_ACTION_OUTSIDE:
-        state = TouchPoint::Leave;
+        state = Dali::PointState::LEAVE;
         break;
       }
 

diff --git a/dali/internal/window-system/common/event-handler.cpp b/dali/internal/window-system/common/event-handler.cpp
index cf8720af5211ac7978bcd3a75c0a51f271ebdcd7..7a1d02b883db5a31d0fc0dca7e7a610b07aef104 100755 (executable)
--- a/dali/internal/window-system/common/event-handler.cpp
+++ b/dali/internal/window-system/common/event-handler.cpp
@@ -22,7 +22,7 @@
 #include <cstring>
 #include <sys/time.h>
 
-#include <dali/public-api/events/touch-point.h>
+#include <dali/devel-api/events/touch-point.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/events/wheel-event.h>
 #include <dali/integration-api/debug.h>
@@ -266,22 +266,22 @@ void EventHandler::OnAccessibilityNotification( const WindowBase::AccessibilityI
   }
 
   // Create a touch point object.
-  TouchPoint::State touchPointState( TouchPoint::Down );
+  PointState::Type touchPointState( PointState::DOWN );
   if( info.state == 0 )
   {
-    touchPointState = TouchPoint::Down; // Mouse down.
+    touchPointState = PointState::DOWN; // Mouse down.
   }
   else if( info.state == 1 )
   {
-    touchPointState = TouchPoint::Motion; // Mouse move.
+    touchPointState = PointState::MOTION; // Mouse move.
   }
   else if( info.state == 2 )
   {
-    touchPointState = TouchPoint::Up; // Mouse up.
+    touchPointState = PointState::UP; // Mouse up.
   }
   else
   {
-    touchPointState = TouchPoint::Interrupted; // Error.
+    touchPointState = PointState::INTERRUPTED; // Error.
   }
 
   // Send touch event to accessibility adaptor.