diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-15 19:08:26 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-15 19:08:26 -0700 |
| commit | 6069139356ceb4d257f749954a2220b1f4fbf9cb (patch) | |
| tree | beb0f34a8b9e1078df11aa9bdd182a48ae27bae8 /services/input | |
| parent | 1af6d27b9eb7ae65ca927b5842a375e00880df9c (diff) | |
| download | frameworks_base-6069139356ceb4d257f749954a2220b1f4fbf9cb.zip frameworks_base-6069139356ceb4d257f749954a2220b1f4fbf9cb.tar.gz frameworks_base-6069139356ceb4d257f749954a2220b1f4fbf9cb.tar.bz2 | |
Remove more edge flag cruft.
Change-Id: I4f9f4f4cc7c771a918aee82a941a3e86ecfe48fe
Diffstat (limited to 'services/input')
| -rw-r--r-- | services/input/InputReader.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index b2fbcb1..ea9da39 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -120,31 +120,11 @@ static const int32_t keyCodeRotationMap[][4] = { static const size_t keyCodeRotationMapSize = sizeof(keyCodeRotationMap) / sizeof(keyCodeRotationMap[0]); -int32_t rotateKeyCode(int32_t keyCode, int32_t orientation) { +static int32_t rotateKeyCode(int32_t keyCode, int32_t orientation) { return rotateValueUsingRotationMap(keyCode, orientation, keyCodeRotationMap, keyCodeRotationMapSize); } -static const int32_t edgeFlagRotationMap[][4] = { - // edge flags enumerated counter-clockwise with the original (unrotated) edge flag first - // no rotation, 90 degree rotation, 180 degree rotation, 270 degree rotation - { AMOTION_EVENT_EDGE_FLAG_BOTTOM, AMOTION_EVENT_EDGE_FLAG_RIGHT, - AMOTION_EVENT_EDGE_FLAG_TOP, AMOTION_EVENT_EDGE_FLAG_LEFT }, - { AMOTION_EVENT_EDGE_FLAG_RIGHT, AMOTION_EVENT_EDGE_FLAG_TOP, - AMOTION_EVENT_EDGE_FLAG_LEFT, AMOTION_EVENT_EDGE_FLAG_BOTTOM }, - { AMOTION_EVENT_EDGE_FLAG_TOP, AMOTION_EVENT_EDGE_FLAG_LEFT, - AMOTION_EVENT_EDGE_FLAG_BOTTOM, AMOTION_EVENT_EDGE_FLAG_RIGHT }, - { AMOTION_EVENT_EDGE_FLAG_LEFT, AMOTION_EVENT_EDGE_FLAG_BOTTOM, - AMOTION_EVENT_EDGE_FLAG_RIGHT, AMOTION_EVENT_EDGE_FLAG_TOP }, -}; -static const size_t edgeFlagRotationMapSize = - sizeof(edgeFlagRotationMap) / sizeof(edgeFlagRotationMap[0]); - -static int32_t rotateEdgeFlag(int32_t edgeFlag, int32_t orientation) { - return rotateValueUsingRotationMap(edgeFlag, orientation, - edgeFlagRotationMap, edgeFlagRotationMapSize); -} - static inline bool sourcesMatchMask(uint32_t sources, uint32_t sourceMask) { return (sources & sourceMask & ~ AINPUT_SOURCE_CLASS_MASK) != 0; } |