summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-08-18 13:38:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-18 13:38:32 -0700
commit72e0b2ab08dc49857955a4560de296fdddada8dc (patch)
treec8e77150d327edf1249f89faf998a6eacdd27508 /include/ui
parentf2af87b39b294a197b9a7aaa611a14cfcd669a16 (diff)
parent2dfd7a7cbfa565e3aca584a9e5b6f681692b5781 (diff)
downloadframeworks_base-72e0b2ab08dc49857955a4560de296fdddada8dc.zip
frameworks_base-72e0b2ab08dc49857955a4560de296fdddada8dc.tar.gz
frameworks_base-72e0b2ab08dc49857955a4560de296fdddada8dc.tar.bz2
Merge "Fix some input device mapping bugs with certain drivers." into gingerbread
Diffstat (limited to 'include/ui')
-rw-r--r--include/ui/InputReader.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/include/ui/InputReader.h b/include/ui/InputReader.h
index 71c6c51..56d2765 100644
--- a/include/ui/InputReader.h
+++ b/include/ui/InputReader.h
@@ -480,10 +480,6 @@ private:
inline void clear() {
fields = 0;
}
-
- inline bool isDirty() {
- return fields != 0;
- }
} mAccumulator;
float mXScale;
@@ -702,7 +698,7 @@ private:
} historyData[AVERAGING_HISTORY_SIZE];
} mAveragingTouchFilter;
- struct JumpTouchFilterState {
+ struct JumpyTouchFilterState {
uint32_t jumpyPointsDropped;
} mJumpyTouchFilter;
@@ -765,10 +761,6 @@ private:
inline void clear() {
fields = 0;
}
-
- inline bool isDirty() {
- return fields != 0;
- }
} mAccumulator;
bool mDown;
@@ -804,7 +796,8 @@ private:
FIELD_ABS_MT_WIDTH_MAJOR = 16,
FIELD_ABS_MT_WIDTH_MINOR = 32,
FIELD_ABS_MT_ORIENTATION = 64,
- FIELD_ABS_MT_TRACKING_ID = 128
+ FIELD_ABS_MT_TRACKING_ID = 128,
+ FIELD_ABS_MT_PRESSURE = 256,
};
uint32_t pointerCount;
@@ -819,6 +812,7 @@ private:
int32_t absMTWidthMinor;
int32_t absMTOrientation;
int32_t absMTTrackingId;
+ int32_t absMTPressure;
inline void clear() {
fields = 0;
@@ -829,10 +823,6 @@ private:
pointerCount = 0;
pointers[0].clear();
}
-
- inline bool isDirty() {
- return pointerCount != 0;
- }
} mAccumulator;
void initialize();