ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Update native activity & event APIs to follow correct conventions.

Browse Source 
Change-Id: Ie64fb3a9c68bc9c117fa5621b75d1f609e304e0e
This commit is contained in:
Dianne Hackborn 2010-06-28 15:27:30 -07:00
parent 0c3af05e12
commit 9c7f8186ae
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ui/Input.h
View File

@ -43,7 +43,7 @@ enum {
/*
* Declare a concrete type for the NDK's input event forward declaration.
*/
struct input_event_t { };
struct AInputEvent { };
namespace android {
@ -136,7 +136,7 @@ struct PointerCoords {
/*
* Input events.
*/
class InputEvent : public input_event_t {
class InputEvent : public AInputEvent {
public:
virtual ~InputEvent() { }

6
include/ui/InputTransport.h
View File

@ -333,13 +333,13 @@ private:
/*
* NDK input queue API.
*/
struct input_queue_t {
struct AInputQueue {
public:
/* Creates a consumer associated with an input channel. */
explicit input_queue_t(const android::sp<android::InputChannel>& channel);
explicit AInputQueue(const android::sp<android::InputChannel>& channel);
/* Destroys the consumer and releases its input channel. */
~input_queue_t();
~AInputQueue();
inline android::InputConsumer& getConsumer() { return mConsumer; }

8
libs/ui/InputTransport.cpp
View File

@ -691,7 +691,7 @@ void InputConsumer::populateMotionEvent(MotionEvent* motionEvent) const {
} // namespace android
// --- input_queue_t ---
// --- AInputQueue ---
using android::InputEvent;
using android::InputChannel;
@ -699,13 +699,13 @@ using android::InputConsumer;
using android::sp;
using android::status_t;
input_queue_t::input_queue_t(const sp<InputChannel>& channel) :
AInputQueue::AInputQueue(const sp<InputChannel>& channel) :
mConsumer(channel) {
}
input_queue_t::~input_queue_t() {
AInputQueue::~AInputQueue() {
}
status_t input_queue_t::consume(InputEvent** event) {
status_t AInputQueue::consume(InputEvent** event) {
return mConsumer.consume(&mInputEventFactory, event);
}