Disable horizontal detection during phone call
Aggressive horizontal orientation ignoring of prox should only be when
outside of the phone call. There is no UI at the top of the screen in
the call except notifications.
Bug: 6006756
Change-Id: Idc615ebcfa96ed59a71c2fb1e67e9a905e1cc2c8
diff --git a/src/com/android/phone/PhoneApp.java b/src/com/android/phone/PhoneApp.java
index 14687fa..d3edb18 100644
--- a/src/com/android/phone/PhoneApp.java
+++ b/src/com/android/phone/PhoneApp.java
@@ -1183,12 +1183,15 @@
|| PhoneUtils.isSpeakerOn(this)
|| ((mBtHandsfree != null) && mBtHandsfree.isAudioOn())
|| mIsHardKeyboardOpen);
- // We do not keep the screen off when we are horizontal, but we do not force it
- // on when we become horizontal until the proximity sensor goes negative.
- boolean horizontal = (mOrientation == AccelerometerListener.ORIENTATION_HORIZONTAL);
- if (((state == Phone.State.OFFHOOK) || mBeginningCall) &&
- !screenOnImmediately && !horizontal) {
+ // We do not keep the screen off when the user is outside in-call screen and we are
+ // horizontal, but we do not force it on when we become horizontal until the
+ // proximity sensor goes negative.
+ boolean horizontal =
+ (mOrientation == AccelerometerListener.ORIENTATION_HORIZONTAL);
+ screenOnImmediately |= !isShowingCallScreen() && horizontal;
+
+ if (((state == Phone.State.OFFHOOK) || mBeginningCall) && !screenOnImmediately) {
// Phone is in use! Arrange for the screen to turn off
// automatically when the sensor detects a close object.
if (!mProximityWakeLock.isHeld()) {
