summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-11-02 02:34:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-02 02:34:15 -0700
commit2d283a68e4f45a3405caeda0254d45edbe3b6abf (patch)
tree3f30d7e631cbcd900be454522eb9738c21bba2d4 /libs
parentd6a3cddba58500c6ae9427a343b035de0ef43251 (diff)
parent5d0a9b474bb8a082691a185d4b574b619f54fc05 (diff)
downloadframeworks_native-2d283a68e4f45a3405caeda0254d45edbe3b6abf.zip
frameworks_native-2d283a68e4f45a3405caeda0254d45edbe3b6abf.tar.gz
frameworks_native-2d283a68e4f45a3405caeda0254d45edbe3b6abf.tar.bz2
am 7ab5d2d9: am a87ea46c: Fix bugs related to cheek event suppression.
* commit '7ab5d2d951792c9b1a1e7cfb279280c2d076506f': Fix bugs related to cheek event suppression.
Diffstat (limited to 'libs')
-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 58d4c56..a02c154 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.
@@ -1424,7 +1424,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;