diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-11-01 21:02:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-01 21:02:05 -0700 |
| commit | 7ab5d2d951792c9b1a1e7cfb279280c2d076506f (patch) | |
| tree | 51056ccc3a744e0ef6266c420086f16999509c01 | |
| parent | 424963ef8d46c34d67ea24d25735944c0d87409c (diff) | |
| parent | a87ea46cb023763e0a9b0222da20b0a354f79d8d (diff) | |
| download | frameworks_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.
| -rw-r--r-- | libs/ui/InputDispatcher.cpp | 6 | ||||
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 4 |
2 files changed, 5 insertions, 5 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; diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index b0e30f9..a6daaef 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2213,9 +2213,9 @@ class PowerManagerService extends IPowerManager.Stub int eventType, boolean force) { if (((mPokey & POKE_LOCK_IGNORE_CHEEK_EVENTS) != 0) - && (eventType == CHEEK_EVENT || eventType == TOUCH_EVENT)) { + && (eventType == CHEEK_EVENT)) { if (false) { - Slog.d(TAG, "dropping cheek or short event mPokey=0x" + Integer.toHexString(mPokey)); + Slog.d(TAG, "dropping cheek event mPokey=0x" + Integer.toHexString(mPokey)); } return; } |