Merge "Remove incomplete input device enumeration NDK API." into gingerbread (875fb77f) · Commits · e / devices / smdk4412 / android_frameworks_native

include/ui/Input.h

+0 −23

Original line number	Diff line number	Diff line
		@@ -466,29 +466,6 @@ private:
		KeyedVector<int32_t, MotionRange> mMotionRanges;
		};

		/*
		* Provides remote access to information about an input device.
		*
		* Note: This is essentially a wrapper for Binder calls into the Window Manager Service.
		*/
		class InputDeviceProxy : public RefBase, public AInputDevice {
		protected:
		InputDeviceProxy();
		virtual ~InputDeviceProxy();

		public:
		static void getDeviceIds(Vector<int32_t>& outIds);

		static sp<InputDeviceProxy> getDevice(int32_t id);

		inline const InputDeviceInfo* getInfo() { return & mInfo; }

		// TODO add hasKeys, keymap, etc...

		private:
		InputDeviceInfo mInfo;
		};


		} // namespace android

+0 −17

Original line number	Diff line number	Diff line
		@@ -210,21 +210,4 @@ void InputDeviceInfo::addMotionRange(int32_t rangeType, const MotionRange& range
		mMotionRanges.add(rangeType, range);
		}

		// class InputDeviceProxy

		InputDeviceProxy::InputDeviceProxy() {
		}

		InputDeviceProxy::~InputDeviceProxy() {
		}

		void InputDeviceProxy::getDeviceIds(Vector<int32_t>& outIds) {
		// TODO use Binder
		}

		sp<InputDeviceProxy> InputDeviceProxy::getDevice(int32_t id) {
		// TODO use Binder
		return NULL;
		}

		} // namespace android