diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java | 7 | ||||
| -rw-r--r-- | java/com/android/incallui/res/values/lineage_config.xml | 20 |
2 files changed, 27 insertions, 0 deletions
diff --git a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java index 8aeb05fea..dbb8df9d5 100644 --- a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java +++ b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java @@ -27,6 +27,8 @@ import com.android.incallui.call.DialerCall; import com.android.incallui.call.DialerCallListener; import com.android.incallui.call.state.DialerCallState; +import com.android.incallui.R; + /** * This class prevents users from accidentally answering calls by keeping the screen off until the * proximity sensor is unblocked. If the screen is already on or if this is a call waiting call then @@ -61,6 +63,11 @@ public class AnswerProximitySensor return false; } + if (!context.getResources().getBoolean(R.bool.config_answer_proximity_sensor_enabled)) { + LogUtil.i("AnswerProximitySensor.shouldUse", "disabled by overlay"); + return false; + } + if (!context .getSystemService(PowerManager.class) .isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) { diff --git a/java/com/android/incallui/res/values/lineage_config.xml b/java/com/android/incallui/res/values/lineage_config.xml new file mode 100644 index 000000000..e9a958de5 --- /dev/null +++ b/java/com/android/incallui/res/values/lineage_config.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2018 The LineageOS 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. +--> +<resources> + <!-- Whether to check that the proximity is unblocked before showing the incoming call UI. --> + <bool name="config_answer_proximity_sensor_enabled">true</bool> +</resources> |