summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-11-08 09:48:20 -0800
committerJoe Onorato <joeo@google.com>2010-11-08 13:02:58 -0800
commit1a542c7b8ed0be049869a12d1e01e2604d052ac2 (patch)
treeed1b5acbe31240e259689a6496ed1cf2dfa5dd1b /libs/ui
parent3915bb845b032dc184dba5e60970b803390ca3ed (diff)
downloadframeworks_base-1a542c7b8ed0be049869a12d1e01e2604d052ac2.zip
frameworks_base-1a542c7b8ed0be049869a12d1e01e2604d052ac2.tar.gz
frameworks_base-1a542c7b8ed0be049869a12d1e01e2604d052ac2.tar.bz2
The CHEEK_TOUCH stuff never worked. Remove it.
Bug: 3104906 Change-Id: Ia37236ba1775fc3ec8c111e2e0b85b105e0dea6a
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/InputDispatcher.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index 299b1ba..7ddb3c7 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -51,9 +51,6 @@
namespace android {
-// 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.
const nsecs_t DEFAULT_INPUT_DISPATCHING_TIMEOUT = 5000 * 1000000LL; // 5 sec
@@ -1416,21 +1413,7 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
}
if (motionEntry->source & AINPUT_SOURCE_CLASS_POINTER) {
- switch (motionEntry->action) {
- case AMOTION_EVENT_ACTION_DOWN:
- eventType = POWER_MANAGER_TOUCH_EVENT;
- break;
- case AMOTION_EVENT_ACTION_UP:
- eventType = POWER_MANAGER_TOUCH_UP_EVENT;
- break;
- default:
- if (motionEntry->eventTime - motionEntry->downTime < LONG_TOUCH_DELAY) {
- eventType = POWER_MANAGER_TOUCH_EVENT;
- } else {
- eventType = POWER_MANAGER_LONG_TOUCH_EVENT;
- }
- break;
- }
+ eventType = POWER_MANAGER_TOUCH_EVENT;
}
break;
}