summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-05-01 15:18:00 -0700
committerJeff Brown <jeffbrown@google.com>2014-05-01 15:22:27 -0700
commit140ffc783c50bbe3b62e817c117a31b93e7f627e (patch)
treea785a3713fcd85f151c037c05bfbe84edc7bbdc0 /policy
parentd5e92318b69d8af6d91dc3b51738913595e0f536 (diff)
downloadframeworks_base-140ffc783c50bbe3b62e817c117a31b93e7f627e.zip
frameworks_base-140ffc783c50bbe3b62e817c117a31b93e7f627e.tar.gz
frameworks_base-140ffc783c50bbe3b62e817c117a31b93e7f627e.tar.bz2
Clean up some terminology related to interactive state.
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 7128cfa..e783b43 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -986,9 +986,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Match current screen state.
if (mPowerManager.isScreenOn()) {
- screenTurningOn(null);
+ wakingUp(null);
} else {
- screenTurnedOff(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
+ goingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
}
}
@@ -4275,7 +4275,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
@Override
- public void screenTurnedOff(int why) {
+ public void goingToSleep(int why) {
EventLog.writeEvent(70000, 0);
synchronized (mLock) {
mScreenOnEarly = false;
@@ -4291,7 +4291,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
@Override
- public void screenTurningOn(final ScreenOnListener screenOnListener) {
+ public void wakingUp(final ScreenOnListener screenOnListener) {
EventLog.writeEvent(70000, 1);
if (false) {
RuntimeException here = new RuntimeException("here");