diff options
| author | 2012-07-27 18:23:22 -0700 | |
|---|---|---|
| committer | 2012-07-27 18:23:22 -0700 | |
| commit | fa14d824d235c33b137a429c3eb6818f273407ab (patch) | |
| tree | 791ff232610cc8590f3cfabbc0e85b98ce838f4e /include/androidfw/PowerManager.h | |
| parent | af3fb2325ef43450916882d85928abc5e474133f (diff) | |
| parent | b696de5c10ebcc7bf42d8487fc0e56e0e937754d (diff) | |
Merge "Move and rename user activity event type constants." into jb-mr1-dev
Diffstat (limited to 'include/androidfw/PowerManager.h')
| -rw-r--r-- | include/androidfw/PowerManager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/androidfw/PowerManager.h b/include/androidfw/PowerManager.h index 59e993abfb9c..ba98db07ca69 100644 --- a/include/androidfw/PowerManager.h +++ b/include/androidfw/PowerManager.h @@ -21,11 +21,11 @@ namespace android { enum { - POWER_MANAGER_OTHER_EVENT = 0, - POWER_MANAGER_BUTTON_EVENT = 1, - POWER_MANAGER_TOUCH_EVENT = 2, + USER_ACTIVITY_EVENT_OTHER = 0, + USER_ACTIVITY_EVENT_BUTTON = 1, + USER_ACTIVITY_EVENT_TOUCH = 2, - POWER_MANAGER_LAST_EVENT = POWER_MANAGER_TOUCH_EVENT, // Last valid event code. + USER_ACTIVITY_EVENT_LAST = USER_ACTIVITY_EVENT_TOUCH, // Last valid event code. }; } // namespace android |