diff options
| author | 2010-08-10 15:47:53 -0700 | |
|---|---|---|
| committer | 2010-08-10 16:28:03 -0700 | |
| commit | 8d4dfd25f7329d0cdcc8dda8bdfadd7ebec3b3a4 (patch) | |
| tree | 612c8b89cfedc86434c5a9532a66ac29db8d9f48 | |
| parent | 81a5c091ca967401a354be73222f0d36360352c2 (diff) | |
Fix safe mode and KeyEvent.getMaxKeyCode().
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
| -rw-r--r-- | include/ui/InputReader.h | 2 | ||||
| -rw-r--r-- | libs/ui/InputReader.cpp | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/ui/InputReader.h b/include/ui/InputReader.h index f1622316fc..71c6c51769 100644 --- a/include/ui/InputReader.h +++ b/include/ui/InputReader.h @@ -454,6 +454,8 @@ public: virtual void reset(); virtual void process(const RawEvent* rawEvent); + virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode); + private: // Amount that trackball needs to move in order to generate a key event. static const int32_t TRACKBALL_MOVEMENT_THRESHOLD = 6; diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp index 661870212f..5f5a4ac4e6 100644 --- a/libs/ui/InputReader.cpp +++ b/libs/ui/InputReader.cpp @@ -1080,6 +1080,14 @@ void TrackballInputMapper::applyPolicyAndDispatch(nsecs_t when, int32_t motionEv 1, & pointerId, pointerCoords, mXPrecision, mYPrecision, downTime); } +int32_t TrackballInputMapper::getScanCodeState(uint32_t sourceMask, int32_t scanCode) { + if (scanCode >= BTN_MOUSE && scanCode < BTN_JOYSTICK) { + return getEventHub()->getScanCodeState(getDeviceId(), scanCode); + } else { + return AKEY_STATE_UNKNOWN; + } +} + // --- TouchInputMapper --- |