summaryrefslogtreecommitdiffstats
path: root/services/input
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-07-27 15:38:50 -0700
committerJeff Brown <jeffbrown@google.com>2012-07-27 18:14:56 -0700
commitb696de5c10ebcc7bf42d8487fc0e56e0e937754d (patch)
tree3339fd190bad6be36c5e2ba8f57ebc11a5bb972b /services/input
parent155fc70252fd9ccee1f05da4e6966a99ec86d499 (diff)
downloadframeworks_base-b696de5c10ebcc7bf42d8487fc0e56e0e937754d.zip
frameworks_base-b696de5c10ebcc7bf42d8487fc0e56e0e937754d.tar.gz
frameworks_base-b696de5c10ebcc7bf42d8487fc0e56e0e937754d.tar.bz2
Move and rename user activity event type constants.
Change-Id: Ie565808796773b6896e71ddfac6aaaf8031de846
Diffstat (limited to 'services/input')
-rw-r--r--services/input/InputDispatcher.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index e63da05..8604f95 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -1693,7 +1693,7 @@ String8 InputDispatcher::getApplicationWindowLabelLocked(
}
void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
- int32_t eventType = POWER_MANAGER_OTHER_EVENT;
+ int32_t eventType = USER_ACTIVITY_EVENT_OTHER;
switch (eventEntry->type) {
case EventEntry::TYPE_MOTION: {
const MotionEntry* motionEntry = static_cast<const MotionEntry*>(eventEntry);
@@ -1702,7 +1702,7 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
}
if (MotionEvent::isTouchEvent(motionEntry->source, motionEntry->action)) {
- eventType = POWER_MANAGER_TOUCH_EVENT;
+ eventType = USER_ACTIVITY_EVENT_TOUCH;
}
break;
}
@@ -1711,7 +1711,7 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
if (keyEntry->flags & AKEY_EVENT_FLAG_CANCELED) {
return;
}
- eventType = POWER_MANAGER_BUTTON_EVENT;
+ eventType = USER_ACTIVITY_EVENT_BUTTON;
break;
}
}