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

Merge "Add input device property for buttons under touchpads"

Browse Source
This commit is contained in:
Michael Wright 2013-07-19 22:45:38 +00:00 committed by Android (Google) Code Review
commit e5bb2a45e0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/input/InputDevice.h
View File

@ -101,6 +101,9 @@ public:
inline void setVibrator(bool hasVibrator) { mHasVibrator = hasVibrator; } inline void setVibrator(bool hasVibrator) { mHasVibrator = hasVibrator; }
inline bool hasVibrator() const { return mHasVibrator; } inline bool hasVibrator() const { return mHasVibrator; }
inline void setButtonUnderPad(bool hasButton) { mHasButtonUnderPad = hasButton; }
inline bool hasButtonUnderPad() const { return mHasButtonUnderPad; }
inline const Vector<MotionRange>& getMotionRanges() const { inline const Vector<MotionRange>& getMotionRanges() const {
return mMotionRanges; return mMotionRanges;
} }
@ -115,6 +118,7 @@ private:
int32_t mKeyboardType; int32_t mKeyboardType;
sp<KeyCharacterMap> mKeyCharacterMap; sp<KeyCharacterMap> mKeyCharacterMap;
bool mHasVibrator; bool mHasVibrator;
bool mHasButtonUnderPad;
Vector<MotionRange> mMotionRanges; Vector<MotionRange> mMotionRanges;
}; };

2
libs/input/InputDevice.cpp
View File

@ -136,6 +136,7 @@ InputDeviceInfo::InputDeviceInfo(const InputDeviceInfo& other) :
mKeyboardType(other.mKeyboardType), mKeyboardType(other.mKeyboardType),
mKeyCharacterMap(other.mKeyCharacterMap), mKeyCharacterMap(other.mKeyCharacterMap),
mHasVibrator(other.mHasVibrator), mHasVibrator(other.mHasVibrator),
mHasButtonUnderPad(other.mHasButtonUnderPad),
mMotionRanges(other.mMotionRanges) { mMotionRanges(other.mMotionRanges) {
} }
@ -152,6 +153,7 @@ void InputDeviceInfo::initialize(int32_t id, int32_t generation,
mSources = 0; mSources = 0;
mKeyboardType = AINPUT_KEYBOARD_TYPE_NONE; mKeyboardType = AINPUT_KEYBOARD_TYPE_NONE;
mHasVibrator = false; mHasVibrator = false;
mHasButtonUnderPad = false;
mMotionRanges.clear(); mMotionRanges.clear();
} }