summaryrefslogtreecommitdiffstats
path: root/include/input
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2013-07-19 22:45:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-19 22:45:38 +0000
commite5bb2a45e0861c7ed953373f86afe44f255f021c (patch)
tree5858326e10e83f44194591f1ba15a0fbbd24569f /include/input
parent1962f6513732682645f74561c0665e168196056e (diff)
parent931fd6dee7891e94650353c09956ccf24b4dfff3 (diff)
downloadframeworks_native-e5bb2a45e0861c7ed953373f86afe44f255f021c.zip
frameworks_native-e5bb2a45e0861c7ed953373f86afe44f255f021c.tar.gz
frameworks_native-e5bb2a45e0861c7ed953373f86afe44f255f021c.tar.bz2
Merge "Add input device property for buttons under touchpads"
Diffstat (limited to 'include/input')
-rw-r--r--include/input/InputDevice.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/input/InputDevice.h b/include/input/InputDevice.h
index 4672ad4..d8256c1 100644
--- a/include/input/InputDevice.h
+++ b/include/input/InputDevice.h
@@ -101,6 +101,9 @@ public:
inline void setVibrator(bool hasVibrator) { mHasVibrator = hasVibrator; }
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 {
return mMotionRanges;
}
@@ -115,6 +118,7 @@ private:
int32_t mKeyboardType;
sp<KeyCharacterMap> mKeyCharacterMap;
bool mHasVibrator;
+ bool mHasButtonUnderPad;
Vector<MotionRange> mMotionRanges;
};