summaryrefslogtreecommitdiffstats
path: root/policy
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 /policy
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 'policy')
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 867f4f4..15d53fb 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3021,11 +3021,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
KeyEvent.KEYCODE_POWER, mDockMode != Intent.EXTRA_DOCK_STATE_UNDOCKED);
} else {
mPowerManager.userActivity(SystemClock.uptimeMillis(), false,
- LocalPowerManager.BUTTON_EVENT);
+ PowerManager.USER_ACTIVITY_EVENT_BUTTON);
}
} else if (!mLidControlsSleep) {
mPowerManager.userActivity(SystemClock.uptimeMillis(), false,
- LocalPowerManager.OTHER_EVENT);
+ PowerManager.USER_ACTIVITY_EVENT_OTHER);
}
}
@@ -4319,7 +4319,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mPowerManager.isScreenOn()) {
if (mKeyguardMediator != null && !mKeyguardMediator.isShowingAndNotHidden()) {
long curTime = SystemClock.uptimeMillis();
- mPowerManager.userActivity(curTime, false, LocalPowerManager.OTHER_EVENT);
+ mPowerManager.userActivity(curTime, false, PowerManager.USER_ACTIVITY_EVENT_OTHER);
}
synchronized (mLock) {