commit e5bb2a45e0861c7ed953373f86afe44f255f021c
author Michael Wright <michaelwr@google.com> Fri Jul 19 22:45:38 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 19 22:45:38 2013 +0000
tree 5858326e10e83f44194591f1ba15a0fbbd24569f
parent 1962f6513732682645f74561c0665e168196056e
parent 931fd6dee7891e94650353c09956ccf24b4dfff3

Merge "Add input device property for buttons under touchpads"

include/input/InputDevice.h

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 @@
     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 @@
     int32_t mKeyboardType;
     sp<KeyCharacterMap> mKeyCharacterMap;
     bool mHasVibrator;
+    bool mHasButtonUnderPad;
 
     Vector<MotionRange> mMotionRanges;
 };

libs/input/InputDevice.cpp

diff --git a/libs/input/InputDevice.cpp b/libs/input/InputDevice.cpp
index 77fa49d..54703d4 100644
--- a/libs/input/InputDevice.cpp
+++ b/libs/input/InputDevice.cpp
@@ -136,6 +136,7 @@
         mKeyboardType(other.mKeyboardType),
         mKeyCharacterMap(other.mKeyCharacterMap),
         mHasVibrator(other.mHasVibrator),
+        mHasButtonUnderPad(other.mHasButtonUnderPad),
         mMotionRanges(other.mMotionRanges) {
 }
 
@@ -152,6 +153,7 @@
     mSources = 0;
     mKeyboardType = AINPUT_KEYBOARD_TYPE_NONE;
     mHasVibrator = false;
+    mHasButtonUnderPad = false;
     mMotionRanges.clear();
 }