diff options
author | Michael Wright <michaelwr@google.com> | 2013-04-05 21:43:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-05 21:43:31 +0000 |
commit | bdb706e48d71af498156efbb10d0f0c1fcef8878 (patch) | |
tree | d7fc1d7057e9055fa23d1c49adcdbe7dd34799c3 /include/androidfw | |
parent | 8299f683f3fbe7ba0f5387b062b31de117882dba (diff) | |
parent | c6091c64c90e9557ea58e0d7cf75915aea7c6c3e (diff) | |
download | frameworks_base-bdb706e48d71af498156efbb10d0f0c1fcef8878.zip frameworks_base-bdb706e48d71af498156efbb10d0f0c1fcef8878.tar.gz frameworks_base-bdb706e48d71af498156efbb10d0f0c1fcef8878.tar.bz2 |
Merge "Pipe through device resolution information" into jb-mr2-dev
Diffstat (limited to 'include/androidfw')
-rw-r--r-- | include/androidfw/InputDevice.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/androidfw/InputDevice.h b/include/androidfw/InputDevice.h index 1aecf80..45dc2db 100644 --- a/include/androidfw/InputDevice.h +++ b/include/androidfw/InputDevice.h @@ -64,6 +64,7 @@ public: float max; float flat; float fuzz; + float resolution; }; void initialize(int32_t id, int32_t generation, const InputDeviceIdentifier& identifier, @@ -83,7 +84,7 @@ public: void addSource(uint32_t source); void addMotionRange(int32_t axis, uint32_t source, - float min, float max, float flat, float fuzz); + float min, float max, float flat, float fuzz, float resolution); void addMotionRange(const MotionRange& range); inline void setKeyboardType(int32_t keyboardType) { mKeyboardType = keyboardType; } |