projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "KeyEvent class pimpling"
[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
b129bcd
..
741f76c
100644
(file)
--- a/
dali/internal/adaptor/android/framework-android.cpp
+++ b/
dali/internal/adaptor/android/framework-android.cpp
@@
-29,7
+29,6
@@
#include <dali/integration-api/adaptor-framework/android/android-framework.h>
#include <dali/public-api/events/touch-point.h>
#include <dali/public-api/events/key-event.h>
#include <dali/integration-api/adaptor-framework/android/android-framework.h>
#include <dali/public-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>
// INTERNAL INCLUDES
#include <dali/internal/system/common/callback-manager.h>
@@
-422,13
+421,13
@@
struct Framework::Impl
int32_t action = AKeyEvent_getAction( event );
int64_t timeStamp = AKeyEvent_getEventTime( event );
int32_t action = AKeyEvent_getAction( event );
int64_t timeStamp = AKeyEvent_getEventTime( event );
-
Dali::KeyEvent::State state = Dali::
KeyEvent::Down;
+
KeyEvent::State state =
KeyEvent::Down;
switch ( action )
{
case AKEY_EVENT_ACTION_DOWN:
break;
case AKEY_EVENT_ACTION_UP:
switch ( action )
{
case AKEY_EVENT_ACTION_DOWN:
break;
case AKEY_EVENT_ACTION_UP:
- state =
Dali::
KeyEvent::Up;
+ state = KeyEvent::Up;
break;
}
break;
}
@@
-441,7
+440,7
@@
struct Framework::Impl
default:
break;
}
default:
break;
}
- Dali::KeyEvent keyEvent
= Dali::DevelKeyEvent::New( keyName, "", "", keyCode, 0, timeStamp, state, "", "", Device::Class::NONE, Device::Subclass::NONE
);
+ Dali::KeyEvent keyEvent
( keyName, "", keyCode, 0, timeStamp, state
);
Dali::Internal::Adaptor::Framework::Impl::NativeAppKeyEvent( framework, keyEvent );
return 1;
}
Dali::Internal::Adaptor::Framework::Impl::NativeAppKeyEvent( framework, keyEvent );
return 1;
}