diff options
| author | Michael Wright <michaelwr@google.com> | 2013-07-19 22:45:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-19 22:45:38 +0000 |
| commit | e5bb2a45e0861c7ed953373f86afe44f255f021c (patch) | |
| tree | 5858326e10e83f44194591f1ba15a0fbbd24569f /libs/input | |
| parent | 1962f6513732682645f74561c0665e168196056e (diff) | |
| parent | 931fd6dee7891e94650353c09956ccf24b4dfff3 (diff) | |
| download | frameworks_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 'libs/input')
| -rw-r--r-- | libs/input/InputDevice.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ InputDeviceInfo::InputDeviceInfo(const InputDeviceInfo& other) : mKeyboardType(other.mKeyboardType), mKeyCharacterMap(other.mKeyCharacterMap), mHasVibrator(other.mHasVibrator), + mHasButtonUnderPad(other.mHasButtonUnderPad), mMotionRanges(other.mMotionRanges) { } @@ -152,6 +153,7 @@ void InputDeviceInfo::initialize(int32_t id, int32_t generation, mSources = 0; mKeyboardType = AINPUT_KEYBOARD_TYPE_NONE; mHasVibrator = false; + mHasButtonUnderPad = false; mMotionRanges.clear(); } |