Update native activity & event APIs to follow correct conventions. (9c7f8186) · Commits · e / os / android_frameworks_native-old

include/ui/Input.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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() { }

+3 −3

Original line number	Diff line number	Diff line
		@@ -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; }

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}