Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 06f009cb: am aab87690: END_BUTTON_BEHAVIOR setting should affect end call button only (not power button)

Browse Source 
Merge commit '06f009cb3bac2e4432e90f2d22f4c28d6b86f8cd'

* commit '06f009cb3bac2e4432e90f2d22f4c28d6b86f8cd':
  END_BUTTON_BEHAVIOR setting should affect end call button only (not power button)
This commit is contained in:
Mike Lockwood
2009-11-23 13:01:38 -08:00
committed by Android Git Automerger
parent ca0bc17432 196c128962
commit d8a903583a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -1718,8 +1718,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mHandler.removeCallbacks(mPowerLongPress);
if (mShouldTurnOffOnKeyUp) {
mShouldTurnOffOnKeyUp = false;
boolean gohome = (mEndcallBehavior & ENDCALL_HOME) != 0;
boolean sleeps = (mEndcallBehavior & ENDCALL_SLEEPS) != 0;
boolean gohome, sleeps;
if (code == KeyEvent.KEYCODE_ENDCALL) {
gohome = (mEndcallBehavior & ENDCALL_HOME) != 0;
sleeps = (mEndcallBehavior & ENDCALL_SLEEPS) != 0;
} else {
gohome = false;
sleeps = true;
}
if (keyguardShowing
|| (sleeps && !gohome)
|| (gohome && !goHome() && sleeps)) {