Move TouchPoint to Devel API

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / android / framework-android.cpp

diff --git a/dali/internal/adaptor/android/framework-android.cpp b/dali/internal/adaptor/android/framework-android.cpp
index 741f76c..f91f596 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,8 +27,9 @@
 #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>
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/callback-manager.h>
@@ -388,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 );
 
@@ -397,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;
       }
 
@@ -421,13 +422,13 @@ struct Framework::Impl
       int32_t action = AKeyEvent_getAction( event );
       int64_t timeStamp = AKeyEvent_getEventTime( event );
 
-      KeyEvent::State state = KeyEvent::Down;
+      Dali::KeyEvent::State state = Dali::KeyEvent::DOWN;
       switch ( action )
       {
       case AKEY_EVENT_ACTION_DOWN:
         break;
       case AKEY_EVENT_ACTION_UP:
-        state = KeyEvent::Up;
+        state = Dali::KeyEvent::UP;
         break;
       }
 
@@ -440,7 +441,7 @@ struct Framework::Impl
       default:
         break;
       }
-      Dali::KeyEvent keyEvent( keyName, "", keyCode, 0, timeStamp, state );
+      Dali::KeyEvent keyEvent = Dali::DevelKeyEvent::New( keyName, "", "", keyCode, 0, timeStamp, state, "", "", Device::Class::NONE, Device::Subclass::NONE );
       Dali::Internal::Adaptor::Framework::Impl::NativeAppKeyEvent( framework, keyEvent );
       return 1;
     }