summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-11-01 21:02:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-01 21:02:05 -0700
commit7ab5d2d951792c9b1a1e7cfb279280c2d076506f (patch)
tree51056ccc3a744e0ef6266c420086f16999509c01 /libs/ui
parent424963ef8d46c34d67ea24d25735944c0d87409c (diff)
parenta87ea46cb023763e0a9b0222da20b0a354f79d8d (diff)
downloadframeworks_base-7ab5d2d951792c9b1a1e7cfb279280c2d076506f.zip
frameworks_base-7ab5d2d951792c9b1a1e7cfb279280c2d076506f.tar.gz
frameworks_base-7ab5d2d951792c9b1a1e7cfb279280c2d076506f.tar.bz2
am a87ea46c: Fix bugs related to cheek event suppression.
* commit 'a87ea46cb023763e0a9b0222da20b0a354f79d8d': Fix bugs related to cheek event suppression.
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/InputDispatcher.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index ae81d26..c0b27fe 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -51,8 +51,8 @@
namespace android {
-// Delay between reporting long touch events to the power manager.
-const nsecs_t EVENT_IGNORE_DURATION = 300 * 1000000LL; // 300 ms
+// Delay before reporting long touch events to the power manager.
+const nsecs_t LONG_TOUCH_DELAY = 300 * 1000000LL; // 300 ms
// Default input dispatching timeout if there is no focused application or paused window
// from which to determine an appropriate dispatching timeout.
@@ -1416,7 +1416,7 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
eventType = POWER_MANAGER_TOUCH_UP_EVENT;
break;
default:
- if (motionEntry->eventTime - motionEntry->downTime >= EVENT_IGNORE_DURATION) {
+ if (motionEntry->eventTime - motionEntry->downTime < LONG_TOUCH_DELAY) {
eventType = POWER_MANAGER_TOUCH_EVENT;
} else {
eventType = POWER_MANAGER_LONG_TOUCH_EVENT;