X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fandroid%2Fframework-android.cpp;h=f91f596ba2db8a4b36d94f071ecb8969f24893c8;hb=1b290b4cbb146aac7da0425fad889af991b56ca2;hp=4d34aa0eeb77d7118d2b2276e231453138a5ff3d;hpb=f8c84075160e519c7ad4687265e4494586cf18a5;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/adaptor/android/framework-android.cpp b/dali/internal/adaptor/android/framework-android.cpp index 4d34aa0..f91f596 100644 --- 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 #include #include -#include +#include #include #include @@ -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; }