Make proxi sensor smart-case friendly
Dialer already have pocket detection. Let's listen sensor on incoming call only when it needed
Signed-off-by: DennySPB <dennyspb@gmail.com>
Change-Id: I1e4631e4997a06cd06c422aeef35c707c7a90eaa
diff --git a/java/com/android/incallui/ProximitySensor.java b/java/com/android/incallui/ProximitySensor.java
index e8e782c..941dc0b 100644
--- a/java/com/android/incallui/ProximitySensor.java
+++ b/java/com/android/incallui/ProximitySensor.java
@@ -354,7 +354,7 @@
uiShowing,
CallAudioState.audioRouteToString(audioRoute));
- if ((isPhoneOffhook || hasIncomingCall) && !screenOnImmediately) {
+ if ((isPhoneOffhook || (hasIncomingCall && proxSpeakerIncallOnly())) && !screenOnImmediately) {
LogUtil.v("ProximitySensor.updateProximitySensorMode", "turning on proximity sensor");
// Phone is in use! Arrange for the screen to turn off
// automatically when the sensor detects a close object.
@@ -408,13 +408,15 @@
}
}
+ private boolean proxSpeakerIncallOnly() {
+ return Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.PROXIMITY_AUTO_SPEAKER_INCALL_ONLY, 0) == 1;
+ }
+
private void setProxSpeaker(final boolean speaker) {
// remove any pending audio changes scheduled
handler.removeCallbacks(activateSpeaker);
final int audioState = audioModeProvider.getAudioState().getRoute();
- final boolean proxSpeakerIncallOnlyPref =
- Settings.System.getInt(mContext.getContentResolver(),
- Settings.System.PROXIMITY_AUTO_SPEAKER_INCALL_ONLY, 0) == 1;
proxSpeakerDelay = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.PROXIMITY_AUTO_SPEAKER_DELAY, 3000);
// if phone off hook (call in session), and prox speaker feature is on
@@ -429,10 +431,10 @@
if (speaker && audioState != CallAudioState.ROUTE_SPEAKER) {
// if prox incall only is off, we set to speaker as long as phone
// is off hook, ignoring whether or not the call state is outgoing
- if (!proxSpeakerIncallOnlyPref
+ if (!proxSpeakerIncallOnly()
// or if prox incall only is on, we have to check the call
// state to decide if AudioState should be speaker
- || (proxSpeakerIncallOnlyPref && !isPhoneOutgoing)) {
+ || (proxSpeakerIncallOnly() && !isPhoneOutgoing)) {
handler.postDelayed(activateSpeaker, proxSpeakerDelay);
}
} else if (!speaker) {