Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev

This commit is contained in:
Yorke Lee
2014-12-17 00:16:58 +00:00
committed by Android (Google) Code Review

View File

@@ -2452,6 +2452,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return -1;
}
// If an incoming call is ringing, HOME is totally disabled.
// (The user is already on the InCallUI at this point,
// and his ONLY options are to answer or reject the call.)
TelecomManager telecomManager = getTelecommService();
if (telecomManager != null && telecomManager.isRinging()) {
Log.i(TAG, "Ignoring HOME; there's a ringing incoming call.");
return -1;
}
// Delay handling home if a double-tap is possible.
if (mDoubleTapOnHomeBehavior != DOUBLE_TAP_HOME_NOTHING) {
mHandler.removeCallbacks(mHomeDoubleTapTimeoutRunnable); // just in case