summaryrefslogtreecommitdiffstats
path: root/policy/src/com/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-04-11 09:24:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-11 09:24:24 +0000
commit861aa0073ae3adc76ef0c313f39e9a0ff6b63197 (patch)
tree5872ae513e9a5bcecbab67a39f68cce8bef3d166 /policy/src/com/android
parent858737d08d9a2db7ef230a17975cd4ded709c3c5 (diff)
parent26c6a50f037c6af9c41b3f96269fe194748605ce (diff)
downloadframeworks_base-861aa0073ae3adc76ef0c313f39e9a0ff6b63197.zip
frameworks_base-861aa0073ae3adc76ef0c313f39e9a0ff6b63197.tar.gz
frameworks_base-861aa0073ae3adc76ef0c313f39e9a0ff6b63197.tar.bz2
am 26c6a50f: Rename isScreenOn() to isInteractive().
* commit '26c6a50f037c6af9c41b3f96269fe194748605ce': Rename isScreenOn() to isInteractive().
Diffstat (limited to 'policy/src/com/android')
-rw-r--r--policy/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 25d071e..77e2462 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -989,7 +989,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
initializeHdmiState();
// Match current screen state.
- if (mPowerManager.isScreenOn()) {
+ if (mPowerManager.isInteractive()) {
screenTurningOn(null);
} else {
screenTurnedOff(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
@@ -4009,7 +4009,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_POWER: {
result &= ~ACTION_PASS_TO_USER;
if (down) {
- boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(isScreenOn,
+ boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive,
event.getDownTime(), isImmersiveMode(mLastSystemUiFlags));
if (panic) {
mHandler.post(mRequestTransientNav);
@@ -4031,7 +4031,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
telephonyService.silenceRinger();
} else if ((mIncallPowerBehavior
& Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0
- && telephonyService.isOffhook() && isScreenOn) {
+ && telephonyService.isOffhook() && interactive) {
// Otherwise, if "Power button ends call" is enabled,
// the Power button will hang up any current active call.
hungUp = telephonyService.endCall();