Dialer: Add option to disable proximity sensor
Provide a switch for end user to disable proximity sensor
while calling/incall.
Change-Id: I086b1db64af820cbc3c111c5caed46391e40664c
Signed-off-by: blinoff82 <blinov.in@gmail.com>
diff --git a/java/com/android/dialer/app/res/values/bliss_strings.xml b/java/com/android/dialer/app/res/values/bliss_strings.xml
index 5fed220..0cc849a 100644
--- a/java/com/android/dialer/app/res/values/bliss_strings.xml
+++ b/java/com/android/dialer/app/res/values/bliss_strings.xml
@@ -18,4 +18,8 @@
<string name="enable_post_call_title">Post call snackbar</string>
<string name="enable_post_call_summary">Enable post call notifications at the bottom of screen</string>
-</resources>
\ No newline at end of file
+ <string name="disable_proximity_sensor_title">Disable proximity sensor</string>
+ <string name="disable_proximity_sensor_summary">Do not turn off touchscreen and display in call based on proximity sensor</string>
+ <string name="sensor_settings_titile">Sensors</string>
+
+</resources>
diff --git a/java/com/android/dialer/app/res/xml/sensor_settings.xml b/java/com/android/dialer/app/res/xml/sensor_settings.xml
new file mode 100644
index 0000000..619620b
--- /dev/null
+++ b/java/com/android/dialer/app/res/xml/sensor_settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2014 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <SwitchPreference
+ android:defaultValue="false"
+ android:key="disable_proximity_sensor_key"
+ android:title="@string/disable_proximity_sensor_title"
+ android:summary="@string/disable_proximity_sensor_summary" />
+
+</PreferenceScreen>
diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
index 972c0c7..828972e 100644
--- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java
+++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.hardware.SensorManager;
import android.net.Uri;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
@@ -44,6 +45,9 @@
import com.android.dialer.util.PermissionsUtil;
import com.android.dialer.voicemail.settings.VoicemailSettingsFragment;
import com.android.voicemail.VoicemailClient;
+
+import static android.hardware.Sensor.TYPE_PROXIMITY;
+
import java.util.List;
/** Activity for dialer settings. */
@@ -107,6 +111,13 @@
soundSettingsHeader.id = R.id.settings_header_sounds_and_vibration;
target.add(soundSettingsHeader);
+ if (showSensorOptions()) {
+ Header sensorSettingsHeader = new Header();
+ sensorSettingsHeader.titleRes = R.string.sensor_settings_titile;
+ sensorSettingsHeader.fragment = SensorSettingsFragment.class.getName();
+ target.add(sensorSettingsHeader);
+ }
+
Header quickResponseSettingsHeader = new Header();
Intent quickResponseSettingsIntent =
new Intent(TelecomManager.ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS);
@@ -330,4 +341,9 @@
private boolean isPrimaryUser() {
return getSystemService(UserManager.class).isSystemUser();
}
+
+ private boolean showSensorOptions() {
+ SensorManager sm = (SensorManager) this.getSystemService(Context.SENSOR_SERVICE);
+ return sm.getDefaultSensor(TYPE_PROXIMITY) != null;
+ }
}
diff --git a/java/com/android/dialer/app/settings/SensorSettingsFragment.java b/java/com/android/dialer/app/settings/SensorSettingsFragment.java
new file mode 100644
index 0000000..3be01f0
--- /dev/null
+++ b/java/com/android/dialer/app/settings/SensorSettingsFragment.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.app.settings;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+import com.android.dialer.app.R;
+
+public class SensorSettingsFragment extends PreferenceFragment {
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ addPreferencesFromResource(R.xml.sensor_settings);
+ }
+}
diff --git a/java/com/android/incallui/ProximitySensor.java b/java/com/android/incallui/ProximitySensor.java
index 9719e5d..5feedbb 100644
--- a/java/com/android/incallui/ProximitySensor.java
+++ b/java/com/android/incallui/ProximitySensor.java
@@ -17,6 +17,7 @@
package com.android.incallui;
import android.content.Context;
+import android.content.SharedPreferences;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManager.DisplayListener;
import android.os.PowerManager;
@@ -31,6 +32,7 @@
import com.android.incallui.audiomode.AudioModeProvider.AudioModeListener;
import com.android.incallui.call.CallList;
import com.android.incallui.call.DialerCall;
+import android.preference.PreferenceManager;
/**
* Class manages the proximity sensor for the in-call UI. We enable the proximity sensor while the
@@ -43,6 +45,7 @@
implements AccelerometerListener.OrientationListener, InCallStateListener, AudioModeListener {
private static final String TAG = ProximitySensor.class.getSimpleName();
+ private static final String PREF_KEY_DISABLE_PROXI_SENSOR = "disable_proximity_sensor_key";
private final PowerManager powerManager;
private final PowerManager.WakeLock proximityWakeLock;
@@ -56,18 +59,26 @@
private boolean isAttemptingVideoCall;
private boolean isVideoCall;
private boolean isRttCall;
+ private SharedPreferences mPrefs;
public ProximitySensor(
@NonNull Context context,
@NonNull AudioModeProvider audioModeProvider,
@NonNull AccelerometerListener accelerometerListener) {
Trace.beginSection("ProximitySensor.Constructor");
+
+ mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+ final boolean mIsProximitySensorDisabled = mPrefs.getBoolean(PREF_KEY_DISABLE_PROXI_SENSOR, false);
+
powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
- if (powerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
+ if (powerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)
+ && !mIsProximitySensorDisabled) {
proximityWakeLock =
powerManager.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG);
+ } else if (mIsProximitySensorDisabled) {
+ turnOffProximitySensor(true); // Ensure the wakelock is released before destroying it.
+ proximityWakeLock = null;
} else {
- LogUtil.i("ProximitySensor.constructor", "Device does not support proximity wake lock.");
proximityWakeLock = null;
}
this.accelerometerListener = accelerometerListener;
@@ -217,6 +228,12 @@
Trace.beginSection("ProximitySensor.updateProximitySensorMode");
final int audioRoute = audioModeProvider.getAudioState().getRoute();
+ final boolean mIsProximitySensorDisabled = mPrefs.getBoolean(PREF_KEY_DISABLE_PROXI_SENSOR, false);
+
+ if (mIsProximitySensorDisabled) {
+ return;
+ }
+
boolean screenOnImmediately =
(CallAudioState.ROUTE_WIRED_HEADSET == audioRoute
|| CallAudioState.ROUTE_SPEAKER == audioRoute